hplip: Fixes runtime errors

The following errors are fixed:
- pyqt4 not found
- hpasio for sane not found
This commit is contained in:
Bastian Köcher 2018-01-25 14:28:56 +01:00
parent efdb0983da
commit 9abc4a550f

View File

@ -78,12 +78,12 @@ pythonPackages.buildPythonApplication {
prePatch = '' prePatch = ''
# HPLIP hardcodes absolute paths everywhere. Nuke from orbit. # HPLIP hardcodes absolute paths everywhere. Nuke from orbit.
find . -type f -exec sed -i \ find . -type f -exec sed -i \
-e s,/etc/hp,$out/etc/hp, \ -e s,/etc/hp,$out/etc/hp,g \
-e s,/etc/sane.d,$out/etc/sane.d, \ -e s,/etc/sane.d,$out/etc/sane.d,g \
-e s,/usr/include/libusb-1.0,${libusb1.dev}/include/libusb-1.0, \ -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, \ -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, \ -e s,/usr/lib/systemd/system,$out/lib/systemd/system,g \
-e s,/var/lib/hp,$out/var/lib/hp, \ -e s,/var/lib/hp,$out/var/lib/hp,g \
{} + {} +
''; '';
@ -96,6 +96,8 @@ pythonPackages.buildPythonApplication {
--with-systraydir=$out/xdg/autostart --with-systraydir=$out/xdg/autostart
--with-mimedir=$out/etc/cups --with-mimedir=$out/etc/cups
--enable-policykit --enable-policykit
--disable-qt4
${stdenv.lib.optionals withQt5 "--enable-qt5"}
" "
export makeFlags=" export makeFlags="
@ -140,9 +142,6 @@ pythonPackages.buildPythonApplication {
mkdir -p $out/var/lib/hp mkdir -p $out/var/lib/hp
cp ${hplipState} $out/var/lib/hp/hplip.state 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 rm $out/etc/udev/rules.d/56-hpmud.rules
''; '';