From fc961af360d5618d712832097b08030b7cf9d932 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 26 Sep 2013 17:00:12 +0200 Subject: [PATCH] ghostscript: Revert to 9.06 The newer version breaks printing to non-Postscript printers (e.g. HP Deskjets). This is because the gstoraster and gstopxl filters were removed. They are now in a package named "cups-filters" that we don't have yet. --- pkgs/misc/ghostscript/default.nix | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index ba136530593a..142c75aeb0fa 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -41,10 +41,10 @@ let }; mainlineSrc = rec { - name = "ghostscript-9.10"; + name = "ghostscript-9.06"; src = fetchurl { url = "http://downloads.ghostscript.com/public/${name}.tar.bz2"; - sha256 = "106mglk77dhdra1m0ddnmaq645xj1aj45qvlh8izv3xx4cdrv3bc"; + sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05"; }; meta = meta_common // { homepage = "http://www.ghostscript.com/"; @@ -79,10 +79,13 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [ - pkgconfig zlib expat openssl - libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec - ] ++ stdenv.lib.optional x11Support x11 + enableParallelBuilding = true; + + buildInputs = + [ pkgconfig zlib expat openssl + libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec + ] + ++ stdenv.lib.optional x11Support x11 ++ stdenv.lib.optional cupsSupport cups ++ libiconvOrEmpty # [] # maybe sometimes jpeg2000 support @@ -102,11 +105,11 @@ stdenv.mkDerivation rec { makeFlagsArray=(CUPSSERVERBIN=$out/lib/cups CUPSSERVERROOT=$out/etc/cups CUPSDATA=$out/share/cups) '' + stdenv.lib.optionalString (variant ? preConfigure) variant.preConfigure; - configureFlags = [ - "--with-system-libtiff" - (if x11Support then "--with-x" else "--without-x") - (if cupsSupport then "--enable-cups" else "--disable-cups") - ]; + configureFlags = + [ "--with-system-libtiff" + (if x11Support then "--with-x" else "--without-x") + (if cupsSupport then "--enable-cups --with-install-cups" else "--disable-cups") + ]; doCheck = true;