diff options
author | Bastian Köcher <git@kchr.de> | 2018-01-25 14:28:56 +0100 |
---|---|---|
committer | Bastian Köcher <git@kchr.de> | 2018-01-26 12:59:00 +0100 |
commit | 9abc4a550f105db6fdf1ddfc6928eba3f5f2171c (patch) | |
tree | 1024acf22a43f8833cec098843aa90a6d4457d45 /pkgs/misc | |
parent | efdb0983dafee81c8c43a9854babec82e9de23b5 (diff) | |
download | nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar.gz nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar.bz2 nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar.lz nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar.xz nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.tar.zst nixpkgs-9abc4a550f105db6fdf1ddfc6928eba3f5f2171c.zip |
hplip: Fixes runtime errors
The following errors are fixed: - pyqt4 not found - hpasio for sane not found
Diffstat (limited to 'pkgs/misc')
-rw-r--r-- | pkgs/misc/drivers/hplip/default.nix | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9897345b88a..f8f8d16d142 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -78,12 +78,12 @@ pythonPackages.buildPythonApplication { prePatch = '' # HPLIP hardcodes absolute paths everywhere. Nuke from orbit. find . -type f -exec sed -i \ - -e s,/etc/hp,$out/etc/hp, \ - -e s,/etc/sane.d,$out/etc/sane.d, \ - -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ - -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor, \ - -e s,/usr/lib/systemd/system,$out/lib/systemd/system, \ - -e s,/var/lib/hp,$out/var/lib/hp, \ + -e s,/etc/hp,$out/etc/hp,g \ + -e s,/etc/sane.d,$out/etc/sane.d,g \ + -e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0,g \ + -e s,/usr/share/hal/fdi/preprobe/10osvendor,$out/share/hal/fdi/preprobe/10osvendor,g \ + -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \ + -e s,/var/lib/hp,$out/var/lib/hp,g \ {} + ''; @@ -96,6 +96,8 @@ pythonPackages.buildPythonApplication { --with-systraydir=$out/xdg/autostart --with-mimedir=$out/etc/cups --enable-policykit + --disable-qt4 + ${stdenv.lib.optionals withQt5 "--enable-qt5"} " export makeFlags=" @@ -140,9 +142,6 @@ pythonPackages.buildPythonApplication { mkdir -p $out/var/lib/hp cp ${hplipState} $out/var/lib/hp/hplip.state - mkdir -p $out/etc/sane.d/dll.d - mv $out/etc/sane.d/dll.conf $out/etc/sane.d/dll.d/hpaio.conf - rm $out/etc/udev/rules.d/56-hpmud.rules ''; |