* CUPS 1.3.9.

svn path=/nixpkgs/trunk/; revision=13217
This commit is contained in:
Eelco Dolstra 2008-11-07 13:36:57 +00:00
parent 2211a319e4
commit 6c107b6706
2 changed files with 23 additions and 15 deletions

View file

@ -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";
};
}

View file

@ -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 {