* Latest CUPS.

svn path=/nixpkgs/trunk/; revision=8532
This commit is contained in:
Eelco Dolstra 2007-04-02 16:22:10 +00:00
parent 83173f1ee9
commit f5daf2b700
4 changed files with 12 additions and 24 deletions

View File

@ -1,5 +0,0 @@
source $stdenv/setup
export INITDIR=$out/etc/rc.d
genericBuild

View File

@ -1,12 +0,0 @@
diff -ruN cups-1.1.23/Makedefs.in cups-1.1.23.new/Makedefs.in
--- cups-1.1.23/Makedefs.in 2005-01-03 20:29:44.000000000 +0100
+++ cups-1.1.23.new/Makedefs.in 2005-10-21 14:53:34.000000000 +0200
@@ -139,7 +139,7 @@
DATADIR = $(BUILDROOT)@CUPS_DATADIR@
DOCDIR = $(BUILDROOT)@CUPS_DOCROOT@
INCLUDEDIR = $(BUILDROOT)$(includedir)
-INITDIR = @INITDIR@
+INITDIR = $(out)/etc/rc.d
INITDDIR = @INITDDIR@
LIBDIR = $(BUILDROOT)$(libdir)
LOCALEDIR = $(BUILDROOT)@CUPS_LOCALEDIR@

View File

@ -1,11 +1,16 @@
{ stdenv, fetchurl}:
{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam}:
stdenv.mkDerivation {
name = "cups-1.1.23";
builder = ./builder.sh;
name = "cups-1.2.10";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/cups-1.1.23-source.tar.bz2;
md5 = "4ce09b1dce09b6b9398af0daae9adf63";
url = http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.2.10/cups-1.2.10-source.tar.bz2;
sha256 = "0dmvjl513kqbb7m4m0b22wa4xvn9avdyihr7fi3n2ly5as93n6v0";
};
patches = [./cups-rc.d.patch];
buildInputs = [zlib libjpeg libpng libtiff pam];
preBuild = "
makeFlagsArray=(INITDIR=$out/etc/rc.d)
";
}

View File

@ -3146,7 +3146,7 @@ rec {
};
cups = import ../misc/cups {
inherit fetchurl stdenv;
inherit fetchurl stdenv zlib libjpeg libpng libtiff pam;
};
dosbox = import ../misc/emulators/dosbox {