public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Making GPL Ghostscript use the system libraries (libjpeg, libpng, ...) so

Browse Source 
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:
Lluís Batlle i Rossell 2012-03-09 17:15:11 +00:00
parent 31cdac999c
commit 6bb466ed9b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/misc/ghostscript/default.nix
View File

@ -48,6 +48,10 @@ let
homepage = http://www.ghostscript.com/; homepage = http://www.ghostscript.com/;
description = "GPL Ghostscript, a PostScript interpreter"; description = "GPL Ghostscript, a PostScript interpreter";
}; };
preConfigure = ''
rm -R libpng jpeg lcms tiff freetype
'';
patches = [ ./purity-9.05.patch ]; patches = [ ./purity-9.05.patch ];
}; };
@ -85,7 +89,7 @@ stdenv.mkDerivation rec {
# Don't install stuff in the Cups store path. # Don't install stuff in the Cups store path.
makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups)
''; '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure;
configureFlags = configureFlags =
(if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++ (if x11Support then [ "--with-x" ] else [ "--without-x" ]) ++

2
pkgs/top-level/all-packages.nix
View File

@ -8392,7 +8392,7 @@ let
ghostscript = callPackage ../misc/ghostscript { ghostscript = callPackage ../misc/ghostscript {
x11Support = false; x11Support = false;
cupsSupport = getConfig [ "ghostscript" "cups" ] true; cupsSupport = getConfig [ "ghostscript" "cups" ] true;
gnuFork = getConfig [ "ghostscript" "gnu" ] true; gnuFork = getConfig [ "ghostscript" "gnu" ] false;
}; };
ghostscriptX = appendToName "with-X" (ghostscript.override { ghostscriptX = appendToName "with-X" (ghostscript.override {