Author: egorochkin
Date: Sun Nov 28 09:46:51 2010
New Revision: 24899
URL: https://svn.nixos.org/websvn/nix/?rev=24899&sc=1
Log:
system-config-printer: fix runtime errors. Patch by Karn Kallio.
Modified:
nixpkgs/trunk/pkgs/tools/misc/system-config-printer/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/tools/misc/system-config-printer/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/tools/misc/system-config-printer/default.nix Sun Nov
28 09:27:45 2010 (r24898)
+++ nixpkgs/trunk/pkgs/tools/misc/system-config-printer/default.nix Sun Nov
28 09:46:51 2010 (r24899)
@@ -1,5 +1,7 @@
{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto,
- docbook_xml_dtd_412, docbook_xsl, libxml2, desktop_file_utils, libusb, cups}:
+ makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl,
+ pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups,
+ notify }:
stdenv.mkDerivation rec {
name = "${meta.name}-${meta.version}";
@@ -9,10 +11,15 @@
sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww";
};
buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412
- libxml2 docbook_xsl desktop_file_utils libusb cups];
+ libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject
+ pygtk pythonDBus pycups notify ];
configureFlags = "--with-udev-rules";
+ postInstall = ''
+ wrapProgram $out/bin/system-config-printer --set PYTHONPATH
"$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0"
+ '';
+
meta = {
name = "system-config-printer";
version = "1.2.4";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 28 09:27:45
2010 (r24898)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Sun Nov 28 09:46:51
2010 (r24899)
@@ -1213,7 +1213,10 @@
svnfs = callPackage ../tools/filesystems/svnfs { };
- system_config_printer = callPackage ../tools/misc/system-config-printer { };
+ system_config_printer = callPackage ../tools/misc/system-config-printer {
+ inherit (pythonPackages) notify;
+ libxml2 = libxml2Python;
+ };
sitecopy = callPackage ../tools/networking/sitecopy { };
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
