From 6bb466ed9bef1c25a390c90024541cf8e2676e7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 9 Mar 2012 17:15:11 +0000 Subject: [PATCH] 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 --- pkgs/misc/ghostscript/default.nix | 6 +++++- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 8df46dd66d4f..cc278d6abe57 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -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" ]) ++ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 209accde02c3..49fdf1e28cb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 {