From c6ee103fc3632cc5c9bf344f24997e799edd2b04 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 28 Jan 2011 10:22:30 +0000 Subject: [PATCH] Update paths - does not fix all the problems, apparently svn path=/nixpkgs/trunk/; revision=25714 --- pkgs/misc/drivers/foo2zjs/default.nix | 2 ++ pkgs/misc/drivers/foomatic-filters/default.nix | 1 + 2 files changed, 3 insertions(+) diff --git a/pkgs/misc/drivers/foo2zjs/default.nix b/pkgs/misc/drivers/foo2zjs/default.nix index da37db6f4e39..f4ac64aa11be 100644 --- a/pkgs/misc/drivers/foo2zjs/default.nix +++ b/pkgs/misc/drivers/foo2zjs/default.nix @@ -33,12 +33,14 @@ rec { ]; fixMakefile = a.fullDepEntry '' touch all-test + sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in '' ["doUnpack" "minInit"]; deployGetWeb = a.fullDepEntry '' ensureDir "$out/bin" ensureDir "$out/share" cp ./getweb "$out/bin" + cp ./arm2hpdl "$out/bin" cp -r PPD "$out/share/foo2zjs-ppd" '' ["minInit" "defEnsureDir"]; diff --git a/pkgs/misc/drivers/foomatic-filters/default.nix b/pkgs/misc/drivers/foomatic-filters/default.nix index 59bdc6612a81..8ab451165e3a 100644 --- a/pkgs/misc/drivers/foomatic-filters/default.nix +++ b/pkgs/misc/drivers/foomatic-filters/default.nix @@ -32,6 +32,7 @@ rec { sed -e "s@= .*/store/[^/]\+/lib/cups/filter@= $out/lib/cups/filter@" -i Makefile sed -e "s@= .*/store/[^/]\+/lib/cups/backend@= $out/lib/cups/backend@" -i Makefile sed -e "s@= /usr/@= $out/@" -i Makefile + sed -e "s@/bin/bash@/bin/sh@g" -i foomaticrip.c '' ["doConfigure" "minInit"]; meta = {