diff options
| -rw-r--r-- | pkgs/tools/misc/system-config-printer/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/pkgs/tools/misc/system-config-printer/default.nix b/pkgs/tools/misc/system-config-printer/default.nix index a828a5fc43c0..f1a9c4b4640a 100644 --- a/pkgs/tools/misc/system-config-printer/default.nix +++ b/pkgs/tools/misc/system-config-printer/default.nix @@ -16,8 +16,6 @@ in stdenv.mkDerivation rec { sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn"; }; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - patches = [ ./detect_serverbindir.patch ]; buildInputs = @@ -27,7 +25,7 @@ in stdenv.mkDerivation rec { ]; pythonPath = with pythonPackages; - [ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; + [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ]; configureFlags = [ "--with-udev-rules" @@ -46,6 +44,7 @@ in stdenv.mkDerivation rec { --set GI_TYPELIB_PATH ${giTypelibPath} \ --set CUPS_DATADIR ${cups-filters}/share/cups" wrapPythonPrograms + # The program imports itself, so we need to move shell wrappers to a proper place. fixupWrapper() { mv "$out/share/system-config-printer/$2.py" \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index cf06f64421e1..5923b06960a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20080,7 +20080,7 @@ in { sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf"; }; - propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; + buildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; # error: invalid command 'test' doCheck = false; |