From f5daf2b700e150a172d5fa3ab215a730c0e37ca5 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Mon, 2 Apr 2007 16:22:10 +0000
Subject: [PATCH] * Latest CUPS.

svn path=/nixpkgs/trunk/; revision=8532
---
 pkgs/misc/cups/builder.sh       |  5 -----
 pkgs/misc/cups/cups-rc.d.patch  | 12 ------------
 pkgs/misc/cups/default.nix      | 17 +++++++++++------
 pkgs/top-level/all-packages.nix |  2 +-
 4 files changed, 12 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/misc/cups/builder.sh
 delete mode 100644 pkgs/misc/cups/cups-rc.d.patch

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)
+  ";
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a9f5b3acadb4..95f653023964 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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 {