Author: urkud
Date: Sun Mar 6 16:07:43 2011
New Revision: 26177
URL: https://svn.nixos.org/websvn/nix/?rev=26177&sc=1
Log:
Trying to fix foo2zjs
There are still some hardcoded paths
Modified:
nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix
Modified: nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix Sun Mar 6 16:07:37
2011 (r26176)
+++ nixpkgs/trunk/pkgs/misc/drivers/foo2zjs/default.nix Sun Mar 6 16:07:43
2011 (r26177)
@@ -1,5 +1,5 @@
x@{builderDefsPackage
- , foomatic_filters, bc, unzip, ghostscript
+ , foomatic_filters, bc, unzip, ghostscript, udev, vim
, ...}:
builderDefsPackage
(a :
@@ -11,10 +11,10 @@
(builtins.attrNames (builtins.removeAttrs x helperArgNames));
sourceInfo = rec {
baseName="foo2zjs";
- version="20090908";
+ version="20110210";
name="${baseName}-${version}";
-
url="http://ftp.de.debian.org/debian/pool/main/f/foo2zjs/foo2zjs_${version}dfsg.orig.tar.gz";;
- hash="1pg4dmckvlx94zxh4gcw7jfmyb10ada7f6vsp5bgz1z95fwwlqjz";
+ url="http://www.loegria.net/mirrors/foo2zjs/${name}.tar.gz";;
+ hash="0vss8gdbbgxr694xw48rys2qflbnb4sp4gdb1v6z4m9ab97hs5yk";
};
in
rec {
@@ -26,16 +26,31 @@
inherit (sourceInfo) name version;
inherit buildInputs;
- phaseNames = ["fixMakefile" "doMakeInstall" "deployGetWeb"];
+ phaseNames = ["fixMakefile" "doMakeDirs" "doMakeInstall" "deployGetWeb"];
makeFlags = [
- ''PREFIX=$out/''
- ''UDEVBIN=$out/bin/''
+ ''PREFIX=$out''
+ ''UDEVBIN=$out/bin''
+ ''UDEVDIR=$out/etc/udev/rules.d''
+ ''UDEVD=${udev}/sbin/udevd''
+ ''LIBUDEVDIR=$out/lib/udev/rules.d''
+ ''USBDIR=$out/etc/hotplug/usb''
+ ''FOODB=$out/share/foomatic/db/source''
+ ''MODEL=$out/share/cups/model''
];
+ installFlags = [ "install-hotplug" ];
fixMakefile = a.fullDepEntry ''
touch all-test
sed -e "/BASENAME=/iPATH=$out/bin:$PATH" -i *-wrapper *-wrapper.in
+ sed -e '/install-usermap/d' -i Makefile
+ sed -e "s@/etc/hotplug/usb@$out&@" -i *rules*
'' ["doUnpack" "minInit"];
+ doMakeDirs = a.fullDepEntry ''
+ mkdir -pv $out/{etc/udev/rules.d,lib/udev/rules.d,etc/hotplug/usb}
+ mkdir -pv $out/share/foomatic/db/source/{opt,printer,driver}
+ mkdir -pv $out/share/cups/model
+ '' ["minInit"];
+
deployGetWeb = a.fullDepEntry ''
ensureDir "$out/bin"
ensureDir "$out/share"
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
