public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

system-config-printer: Remove -dev paths from closure 

Workaround for #24128.
This commit is contained in:
Eelco Dolstra 2017-03-20 16:26:04 +01:00
parent 6dd5846f1b
commit 5897aa771c
No known key found for this signature in database
GPG Key ID: 8170B4726D7198DE
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkgs/tools/misc/system-config-printer/default.nix
View File

@ -16,8 +16,6 @@ in stdenv.mkDerivation rec {
sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn"; sha256 = "1vxczk22f58nbikvj47s2x1gzh6q4mbgwnf091p00h3b6nxppdgn";
}; };
propagatedBuildInputs = [ pythonPackages.pycurl ];
patches = [ ./detect_serverbindir.patch ]; patches = [ ./detect_serverbindir.patch ];
buildInputs = buildInputs =
@ -27,7 +25,7 @@ in stdenv.mkDerivation rec {
]; ];
pythonPath = with pythonPackages; pythonPath = with pythonPackages;
[ pycups pycurl dbus-python pygobject3 requests2 pycairo ]; [ pycups pycurl dbus-python pygobject3 requests2 pycairo pythonPackages.pycurl ];
configureFlags = configureFlags =
[ "--with-udev-rules" [ "--with-udev-rules"
@ -46,6 +44,7 @@ in stdenv.mkDerivation rec {
--set GI_TYPELIB_PATH ${giTypelibPath} \ --set GI_TYPELIB_PATH ${giTypelibPath} \
--set CUPS_DATADIR ${cups-filters}/share/cups" --set CUPS_DATADIR ${cups-filters}/share/cups"
wrapPythonPrograms wrapPythonPrograms
# The program imports itself, so we need to move shell wrappers to a proper place. # The program imports itself, so we need to move shell wrappers to a proper place.
fixupWrapper() { fixupWrapper() {
mv "$out/share/system-config-printer/$2.py" \ mv "$out/share/system-config-printer/$2.py" \

2
pkgs/top-level/python-packages.nix
View File

@ -20080,7 +20080,7 @@ in {
sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf"; sha256 = "0v5w66ir3siimfzg3kc8hfrrilwwnbxq5bvipmrpyxar0kw715vf";
}; };
propagatedBuildInputs = with self; [ pkgs.curl pkgs.openssl.out ]; buildInputs = with self; [ pkgs.curl pkgs.openssl.out ];
# error: invalid command 'test' # error: invalid command 'test'
doCheck = false; doCheck = false;