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

hplip: canonicalise 56-hpmud.rules' paths if installed

Browse Source 
Fixes #14338.
This commit is contained in:
Tobias Geerinckx-Rice 2016-04-01 21:07:40 +02:00
parent 621218c3c1
commit d54bc765b5
2 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/misc/drivers/hplip/3.15.9.nix
View File

@ -2,6 +2,7 @@
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, polkit , net_snmp, polkit
, bash, coreutils, utillinux
, qtSupport ? true, qt4, pyqt4 , qtSupport ? true, qt4, pyqt4
, withPlugin ? false , withPlugin ? false
}: }:
@ -112,8 +113,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = stdenv.lib.optionalString withPlugin postInstall = stdenv.lib.optionalString withPlugin ''
''
sh ${plugin} --noexec --keep sh ${plugin} --noexec --keep
cd plugin_tmp cd plugin_tmp
@ -175,6 +175,14 @@ stdenv.mkDerivation {
wrapPythonProgramsIn $out/lib "$out $pythonPath" wrapPythonProgramsIn $out/lib "$out $pythonPath"
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
'' + stdenv.lib.optionalString (!withPlugin) ''
# A udev rule to notify users that they need the binary plugin.
# Needs a lot of patching but might save someone a bit of confusion:
substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
--replace {,${bash}}/bin/sh \
--replace {/usr,${coreutils}}/bin/nohup \
--replace {,${utillinux}/bin/}logger \
--replace {/usr,$out}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {

12
pkgs/misc/drivers/hplip/default.nix
View File

@ -2,6 +2,7 @@
, pkgconfig , pkgconfig
, cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils , cups, zlib, libjpeg, libusb1, pythonPackages, sane-backends, dbus, usbutils
, net_snmp, polkit , net_snmp, polkit
, bash, coreutils, utillinux
, qtSupport ? true, qt4, pyqt4 , qtSupport ? true, qt4, pyqt4
, withPlugin ? false , withPlugin ? false
}: }:
@ -112,8 +113,7 @@ stdenv.mkDerivation {
enableParallelBuilding = true; enableParallelBuilding = true;
postInstall = stdenv.lib.optionalString withPlugin postInstall = stdenv.lib.optionalString withPlugin ''
''
sh ${plugin} --noexec --keep sh ${plugin} --noexec --keep
cd plugin_tmp cd plugin_tmp
@ -175,6 +175,14 @@ stdenv.mkDerivation {
wrapPythonProgramsIn $out/lib "$out $pythonPath" wrapPythonProgramsIn $out/lib "$out $pythonPath"
substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out
'' + stdenv.lib.optionalString (!withPlugin) ''
# A udev rule to notify users that they need the binary plugin.
# Needs a lot of patching but might save someone a bit of confusion:
substituteInPlace $out/etc/udev/rules.d/56-hpmud.rules \
--replace {,${bash}}/bin/sh \
--replace {/usr,${coreutils}}/bin/nohup \
--replace {,${utillinux}/bin/}logger \
--replace {/usr,$out}/bin
''; '';
meta = with stdenv.lib; { meta = with stdenv.lib; {