about summary refs log tree commit diff
path: root/pkgs/misc
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-09 17:15:11 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2012-03-09 17:15:11 +0000
commit6bb466ed9bef1c25a390c90024541cf8e2676e7f (patch)
treed17226126a2bc4b98d604366202b28fab514aef6 /pkgs/misc
parent31cdac999c876d6367076e696e6adc6fc52debe9 (diff)
downloadnixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar.gz
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar.bz2
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar.lz
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar.xz
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.tar.zst
nixlib-6bb466ed9bef1c25a390c90024541cf8e2676e7f.zip
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
Diffstat (limited to 'pkgs/misc')
-rw-r--r--pkgs/misc/ghostscript/default.nix6
1 files changed, 5 insertions, 1 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" ]) ++