* X11 support in Ghostscript.

svn path=/nixpkgs/trunk/; revision=3751
This commit is contained in:
Eelco Dolstra 2005-08-30 13:50:14 +00:00
parent 860e14cd3d
commit e468256879
2 changed files with 12 additions and 4 deletions

View file

@ -1,4 +1,8 @@
{stdenv, fetchurl, libjpeg, libpng, zlib}: { stdenv, fetchurl, libjpeg, libpng, zlib
, x11Support, x11 ? null
}:
assert x11Support -> x11 != null;
stdenv.mkDerivation { stdenv.mkDerivation {
name = "ghostscript-8.15"; name = "ghostscript-8.15";
@ -17,7 +21,10 @@ stdenv.mkDerivation {
# ... add other fonts here # ... add other fonts here
]; ];
buildInputs = [libjpeg libpng zlib]; buildInputs = [
libjpeg libpng zlib
(if x11Support then x11 else null)
];
configureFlags = "--without-x"; configureFlags = if x11Support then "--with-x" else "--without-x";
} }

View file

@ -1510,7 +1510,8 @@ rec {
}; };
ghostscript = (import ../misc/ghostscript) { ghostscript = (import ../misc/ghostscript) {
inherit fetchurl stdenv libjpeg libpng zlib; inherit fetchurl stdenv libjpeg libpng zlib x11;
x11Support = false;
}; };
nix = (import ../misc/nix) { nix = (import ../misc/nix) {