Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so
the previous troubles with a mixture of libpng versions fade away. I also enable back GPL Ghostscript as the default. I checked that 'awesome' builds fine (it calls imagemagick for some pictures in its build script), as a proof that imagemagick does not crash anymore. svn path=/nixpkgs/trunk/; revision=32958
This commit is contained in:
parent
31cdac999c
commit
6bb466ed9b
|
@ -48,6 +48,10 @@ let
|
|||
homepage = http://www.ghostscript.com/;
|
||||
description = "GPL Ghostscript, a PostScript interpreter";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
rm -R libpng jpeg lcms tiff freetype
|
||||
'';
|
||||
patches = [ ./purity-9.05.patch ];
|
||||
};
|
||||
|
||||
|
@ -85,7 +89,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
# Don't install stuff in the Cups store path.
|
||||
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
|
||||
'';
|
||||
'' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
|
||||
|
||||
configureFlags =
|
||||
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++
|
||||
|
|
|
@ -8392,7 +8392,7 @@ let
|
|||
ghostscript = callPackage ../misc/ghostscript {
|
||||
x11Support = false;
|
||||
cupsSupport = getConfig [ "ghostscript" "cups" ] true;
|
||||
gnuFork = getConfig [ "ghostscript" "gnu" ] true;
|
||||
gnuFork = getConfig [ "ghostscript" "gnu" ] false;
|
||||
};
|
||||
|
||||
ghostscriptX = appendToName "with-X" (ghostscript.override {
|
||||
|
|
Loading…
Reference in a new issue