diff options
author | Joerg Thalheim <joerg@thalheim.io> | 2017-11-24 22:59:44 +0000 |
---|---|---|
committer | Andreas Rammhold <andreas@rammhold.de> | 2017-11-25 12:24:23 +0100 |
commit | 3f1c4360a8364d0a4ca8612d5df41de7096de79d (patch) | |
tree | 1e9a8ad833f20b74ebcd7a72d39214d29c3b3a77 /pkgs/tools/misc | |
parent | 52333332655be7b053279503de212f13586c88d1 (diff) | |
download | nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar.gz nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar.bz2 nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar.lz nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar.xz nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.tar.zst nixlib-3f1c4360a8364d0a4ca8612d5df41de7096de79d.zip |
system-config-printer: fix python path
propagated dependencies were not added to PYTHONPATH
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 66 |
1 files changed, 32 insertions, 34 deletions
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index 11d61cfe30f3..7f584563fa11 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -18,49 +18,47 @@ stdenv.mkDerivation rec { patches = [ ./detect_serverbindir.patch ]; - buildInputs = - [ intltool pkgconfig glib udev libusb1 cups xmlto - libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils - pythonPackages.python pythonPackages.wrapPython - libnotify gobjectIntrospection gdk_pixbuf pango atk - libgnome_keyring3 - ]; + buildInputs = [ + intltool pkgconfig glib udev libusb1 cups xmlto + libxml2 docbook_xml_dtd_412 docbook_xsl desktop_file_utils - nativeBuildInputs = [ wrapGAppsHook ]; + libnotify gobjectIntrospection gdk_pixbuf pango atk + libgnome_keyring3 + + (pythonPackages.python.withPackages (ps: with ps; [ + pycups pycurl dbus-python pygobject3 requests pycairo pysmbc + ])) + ]; - pythonPath = with pythonPackages; requiredPythonModules [ pycups pycurl dbus-python pygobject3 requests pycairo pysmbc ]; + nativeBuildInputs = [ wrapGAppsHook ]; - configureFlags = - [ "--with-udev-rules" - "--with-udevdir=$(out)/etc/udev" - "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - ]; + configureFlags = [ + "--with-udev-rules" + "--with-udevdir=$(out)/etc/udev" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; stripDebugList = [ "bin" "lib" "etc/udev" ]; - postInstall = - '' - buildPythonPath "$out $pythonPath" - gappsWrapperArgs+=( - --prefix PATH : "$program_PATH" - --set CUPS_DATADIR "${cups-filters}/share/cups" - ) - - find $out/share/system-config-printer -name \*.py -type f -perm -0100 -print0 | while read -d "" f; do - patchPythonScript "$f" - done + postInstall = '' + gappsWrapperArgs+=( + --prefix PATH : "$program_PATH" + --prefix PYTHONPATH : "$out/${pythonPackages.python.sitePackages}" + --set CUPS_DATADIR "${cups-filters}/share/cups" + ) - # The below line will be unneeded when the next upstream release arrives. - sed -i -e "s|/usr/local/bin|$out/bin|" "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" + # The below line will be unneeded when the next upstream release arrives. + sed -i -e "s|/usr/local/bin|$out/bin|" \ + "$out/share/dbus-1/services/org.fedoraproject.Config.Printing.service" - # Manually expand literal "$(out)", which have failed to expand - sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ - -i "$out/etc/systemd/system/configure-printer@.service" - ''; + # Manually expand literal "$(out)", which have failed to expand + sed -e "s|ExecStart=\$(out)|ExecStart=$out|" \ + -i "$out/etc/systemd/system/configure-printer@.service" + ''; - meta = { + meta = with stdenv.lib; { homepage = http://cyberelk.net/tim/software/system-config-printer/; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + license = licenses.gpl2; }; } |