From b89f2ef1e4061358d9b27a0bd19569b7b01534c0 Mon Sep 17 00:00:00 2001 From: Evgeny Egorochkin Date: Sun, 28 Nov 2010 09:46:51 +0000 Subject: [PATCH] system-config-printer: fix runtime errors. Patch by Karn Kallio. svn path=/nixpkgs/trunk/; revision=24899 --- pkgs/tools/misc/system-config-printer/default.nix | 11 +++++++++-- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 4191ffd6f80..99873766024 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -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 @@ stdenv.mkDerivation rec { 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cab56d41736..11baab26eb2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1213,7 +1213,10 @@ let 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 { };