From 6c107b6706559171caf848365759db9d9ed9f255 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 7 Nov 2008 13:36:57 +0000
Subject: [PATCH] * CUPS 1.3.9.

svn path=/nixpkgs/trunk/; revision=13217
---
 pkgs/misc/cups/default.nix      | 36 ++++++++++++++++++++-------------
 pkgs/top-level/all-packages.nix |  2 +-
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix
index 80650cac346e..de56e336289e 100644
--- a/pkgs/misc/cups/default.nix
+++ b/pkgs/misc/cups/default.nix
@@ -1,31 +1,39 @@
-{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam}:
+{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}:
 
 stdenv.mkDerivation {
-  name = "cups-1.2.10";
+  name = "cups-1.3.9";
   
   src = fetchurl {
-    url = http://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/1.2.10/cups-1.2.10-source.tar.bz2;
-    sha256 = "0dmvjl513kqbb7m4m0b22wa4xvn9avdyihr7fi3n2ly5as93n6v0";
+    url = http://ftp.easysw.com/pub/cups/1.3.9/cups-1.3.9-source.tar.bz2;
+    sha256 = "0svb5alfsj9bfraw0yb9i92g5hc9h36m9xfipvi1pxdwp2s6m19q";
   };
 
-  buildInputs = [zlib libjpeg libpng libtiff pam];
+  buildInputs = [zlib libjpeg libpng libtiff pam openssl];
 
-  preConfigure = "
-    configureFlags=\"--localstatedir=/var\"
-  ";
+  preConfigure = ''
+    configureFlags="--localstatedir=/var"
+  '';
 
-  preBuild = "
+  preBuild = ''
     makeFlagsArray=(INITDIR=$out/etc/rc.d)
-  ";
+  '';
 
   # Awful hack: CUPS' `make install' wants to write in /var, but it
   # can't.  So redirect it with a BUILDROOT (=DESTDIR).
-  preInstall = "
+  preInstall = ''
     installFlagsArray=(BUILDROOT=$out/destdir)
-  ";
+  '';
 
-  postInstall = "
+  # !!! Ideally, we wouldn't have Samba as a dependency of CUPS.
+  # Rather, the backend directory should be treated as configuration
+  # data generated in some other Nix expression in NixOS.
+  postInstall = ''
     mv $out/destdir/$out/* $out
     rm -rf $out/destdir
-  ";
+  ''; # */
+
+  meta = {
+    homepage = http://www.cups.org/;
+    description = "A standards-based printing system for UNIX";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8e10b8e0b386..3ae5106cf372 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8444,7 +8444,7 @@ let
   };
 
   cups = import ../misc/cups {
-    inherit fetchurl stdenv zlib libjpeg libpng libtiff pam;
+    inherit fetchurl stdenv zlib libjpeg libpng libtiff pam openssl;
   };
 
   dblatex = import ../misc/tex/dblatex {