diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-21 22:18:41 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-07-21 22:18:41 +0000 |
commit | f9320cb33a34efb1a7a294e6aa62cae496f30530 (patch) | |
tree | ee227b432727d345515f19cdcdad1268a330c974 /pkgs/tools | |
parent | 5a03576cb499ae3e52f61fbc11292bc50d692842 (diff) |
* Update system-config-printer to 1.3.4.
svn path=/nixpkgs/branches/kde-4.7/; revision=27896
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 37 |
1 files changed, 24 insertions, 13 deletions
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 998737660242f..4195a69b071cb 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -1,27 +1,38 @@ -{stdenv, fetchurl, udev, intltool, python, pkgconfig, glib, xmlto, - makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl, - pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups, - notify }: +{ stdenv, fetchurl, udev, intltool, pkgconfig, glib, xmlto +, makeWrapper, pygobject, pygtk, docbook_xml_dtd_412, docbook_xsl +, pythonDBus, libxml2, desktop_file_utils, libusb, cups, pycups +, xz, pythonPackages +}: stdenv.mkDerivation rec { name = "${meta.name}-${meta.version}"; src = fetchurl { - url = "http://cyberelk.net/tim/data/${meta.name}/1.2/${name}.tar.bz2"; - sha256 = "16xjvahmdkkix7281gx7ac9zqaxgfb7pjjlgcc6kmw52cifk86ww"; + url = "http://cyberelk.net/tim/data/${meta.name}/1.3/${name}.tar.xz"; + sha256 = "1d50rqgpyrzyrxwq3qhafzq9075qm2wxdrh1f1q7whlr0chxi3mw"; }; - buildInputs = [ udev intltool python pkgconfig glib xmlto docbook_xml_dtd_412 - libxml2 docbook_xsl desktop_file_utils libusb cups makeWrapper pygobject - pygtk pythonDBus pycups notify ]; + buildInputs = + [ xz intltool pkgconfig glib udev libusb cups xmlto + libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils + pythonPackages.python pythonPackages.wrapPython + ]; + + pythonPath = [ pythonDBus pycups pygtk pythonPackages.notify ]; + configureFlags = "--with-udev-rules"; - postInstall = '' - wrapProgram $out/bin/system-config-printer --set PYTHONPATH "$PYTHONPATH:$(toPythonPath $out):$(toPythonPath ${notify})/gtk-2.0" - ''; + postInstall = + '' + + wrapPythonPrograms + ( cd $out/share/system-config-printer/troubleshoot + mv .__init__.py-wrapped __init__.py + ) + ''; meta = { name = "system-config-printer"; - version = "1.2.4"; + version = "1.3.4"; }; } |