diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-02 16:22:10 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2007-04-02 16:22:10 +0000 |
| commit | f5daf2b700e150a172d5fa3ab215a730c0e37ca5 (patch) | |
| tree | dc0f888441fb9610c2030bc35231c312fa94b58c /pkgs/misc/cups | |
| parent | 83173f1ee9ac8e0678e5ca6232cc54749100cd41 (diff) | |
| download | nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar.gz nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar.bz2 nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar.lz nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar.xz nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.tar.zst nixlib-f5daf2b700e150a172d5fa3ab215a730c0e37ca5.zip | |
* Latest CUPS.
svn path=/nixpkgs/trunk/; revision=8532
Diffstat (limited to 'pkgs/misc/cups')
| -rw-r--r-- | pkgs/misc/cups/builder.sh | 5 | ||||
| -rw-r--r-- | pkgs/misc/cups/cups-rc.d.patch | 12 | ||||
| -rw-r--r-- | pkgs/misc/cups/default.nix | 17 |
3 files changed, 11 insertions, 23 deletions
diff --git a/pkgs/misc/cups/builder.sh b/pkgs/misc/cups/builder.sh deleted file mode 100644 index 6b1ded40cd3a..000000000000 --- a/pkgs/misc/cups/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -export INITDIR=$out/etc/rc.d - -genericBuild diff --git a/pkgs/misc/cups/cups-rc.d.patch b/pkgs/misc/cups/cups-rc.d.patch deleted file mode 100644 index f6c87e93b77d..000000000000 --- a/pkgs/misc/cups/cups-rc.d.patch +++ /dev/null @@ -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@ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index e074837adf2b..373f3ca69522 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -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) + "; } |