* Updated CUPS to 1.4.1.

svn path=/nixpkgs/branches/xorg-7.5/; revision=18048
This commit is contained in:
Eelco Dolstra 2009-10-30 09:46:51 +00:00
parent 27ab1e3cc7
commit 78648561c5
3 changed files with 27 additions and 18 deletions

View file

@ -1,11 +1,11 @@
{ stdenv, fetchurl, pkgconfig, glib, atk, pango, libtiff, libjpeg
, libpng, cairo, perl, jasper, xlibs
, xineramaSupport ? true
, cupsSupport ? true, cups ? null, openssl ? null
, cupsSupport ? true, cups ? null
}:
assert xineramaSupport -> xlibs.libXinerama != null;
assert cupsSupport -> cups != null && openssl != null;
assert cupsSupport -> cups != null;
stdenv.mkDerivation rec {
name = "gtk+-2.18.3";
@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
propagatedBuildInputs =
[ xlibs.xlibs glib atk pango libtiff libjpeg libpng cairo xlibs.libXrandr ]
++ stdenv.lib.optional xineramaSupport xlibs.libXinerama
++ stdenv.lib.optionals cupsSupport [ cups openssl ];
++ stdenv.lib.optionals cupsSupport [ cups ];
passthru = { inherit libtiff libjpeg libpng; };

View file

@ -1,16 +1,25 @@
{stdenv, fetchurl, zlib, libjpeg, libpng, libtiff, pam, openssl}:
let version = "1.3.10"; in
let version = "1.4.1"; in
stdenv.mkDerivation {
name = "cups-${version}";
src = fetchurl {
url = "http://ftp.easysw.com/pub/cups/${version}/cups-${version}-source.tar.bz2";
sha256 = "0rmm1dj8ha8d5c9lpdsfpfyw6l6lnkxl36xlxqdrjnm0lr2sa0cp";
sha256 = "1fnkq993hr8l87x6f7a7wik2spac3f7nn4wksrvwk690r8a6zxng";
};
buildInputs = [zlib libjpeg libpng libtiff pam openssl];
patches =
[ (fetchurl {
url = http://www.cups.org/strfiles/3332/0001-Fixed-side_cb-function-declaration-in-usb-unix.c.patch;
sha256 = "0h8fhhpzp7xngnc428040jv09yvpz5dxb9hw6sv67lnvb03fncnw";
})
];
buildInputs = [ zlib libjpeg libpng libtiff pam ];
propagatedBuildInputs = [ openssl ];
preConfigure = ''
configureFlags="--localstatedir=/var"
@ -19,20 +28,20 @@ stdenv.mkDerivation {
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 = ''
installFlagsArray=(BUILDROOT=$out/destdir)
'';
postInstall = ''
mv $out/destdir/$out/* $out
rm -rf $out/destdir
''; # */
installFlags =
[ # Don't try to write in /var at build time.
"CACHEDIR=$(TMPDIR)/dummy"
"LOGDIR=$(TMPDIR)/dummy"
"REQUESTS=$(TMPDIR)/dummy"
"STATEDIR=$(TMPDIR)/dummy"
# Work around a Makefile bug.
"CUPS_PRIMARY_SYSTEM_GROUP=root"
];
meta = {
homepage = http://www.cups.org/;
description = "A standards-based printing system for UNIX";
license = "GPLv2"; # actually LGPL for the library and GPL for the rest
};
}

View file

@ -3615,7 +3615,7 @@ let
gtk = import ../development/libraries/gtk+/2.18.x.nix {
inherit fetchurl stdenv pkgconfig perl jasper glib atk pango
libtiff libjpeg libpng cairo xlibs cups openssl;
libtiff libjpeg libpng cairo xlibs cups;
};
gtkmm = import ../development/libraries/gtkmm/2.18.x.nix {