From aebb3ec0f4edcd5f7f51b6c794e7a20da3f9bd3b Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Wed, 22 Jul 2015 23:17:08 +0200 Subject: hplip: patch shebangs in $out/share A full wrap isn't needed as these scripts are only run from within hplip's own environment, and unwanted because they are imported as Python modules. Also fix a reference to /etc in $out/etc/hp/hplip.conf, though I've no idea whether it is actually used. --- pkgs/misc/drivers/hplip/default.nix | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'pkgs/misc/drivers') diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index a96e71a3af0f..d173b0ac406e 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -139,9 +139,9 @@ stdenv.mkDerivation { '')); fixupPhase = '' - # Wrap the user-facing Python scripts in /bin without turning the ones - # in /share into shell scripts (they need to be importable). - # Complicated by the fact that /bin contains just symlinks to /share. + # Wrap the user-facing Python scripts in $out/bin without turning the + # ones in $out /share into shell scripts (they need to be importable). + # Note that $out/bin contains only symlinks to $out/share. for bin in $out/bin/*; do py=`readlink -m $bin` rm $bin @@ -153,7 +153,18 @@ stdenv.mkDerivation { # Remove originals. Knows a little too much about wrapPythonProgramsIn. rm -f $out/bin/.*-wrapped + # Merely patching shebangs in $out/share does not cause trouble. + for i in $out/share/hplip{,/*}/*.py; do + substituteInPlace $i \ + --replace /usr/bin/python \ + ${pythonPackages.python}/bin/${pythonPackages.python.executable} \ + --replace "/usr/bin/env python" \ + ${pythonPackages.python}/bin/${pythonPackages.python.executable} + done + wrapPythonProgramsIn $out/lib "$out $pythonPath" + + substituteInPlace $out/etc/hp/hplip.conf --replace /usr $out ''; meta = with stdenv.lib; { -- cgit 1.4.1