Adding mainline ghostscript as an option.

svn path=/nixpkgs/trunk/; revision=27297

pkgs/misc/ghostscript/default.nix

@@ -1,21 +1,63 @@
 { stdenv, fetchurl, libjpeg, libpng, libtiff, zlib, pkgconfig, fontconfig, openssl
 , x11Support, x11 ? null
 , cupsSupport ? false, cups ? null
+, gnuFork ? true
 }:
 
 assert x11Support -> x11 != null;
 assert cupsSupport -> cups != null;
 
-stdenv.mkDerivation rec {
+let
+  meta = {
+    homepage = http://www.gnu.org/software/ghostscript/;
+    description = "GNU Ghostscript, a PostScript interpreter";
+
+    longDescription = ''
+      Ghostscript is the name of a set of tools that provides (i) an
+      interpreter for the PostScript language and the PDF file format,
+      (ii) a set of C procedures (the Ghostscript library) that
+      implement the graphics capabilities that appear as primitive
+      operations in the PostScript language, and (iii) a wide variety
+      of output drivers for various file formats and printers.
+    '';
+
+    license = "GPLv3+";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ];
+  };
+
+  gnuForkData = rec {
     name = "ghostscript-8.71.1";
-
-  builder = ./builder.sh;
-
     src = fetchurl {
       url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
       sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl";
     };
 
+    inherit meta;
+  };
+
+  mainlineData = {
+    name = "ghostscript-9.02";
+    src = fetchurl {
+      url = http://downloads.ghostscript.com/public/ghostscript-9.02.tar.bz2;
+      sha256 = "0np0kr02bsqzag9sdbcg2kkjda0rjsvi484ic28qyvx32fnjrsh3";
+    };
+    meta = meta // {
+      homepage = http://www.ghostscript.com/;
+      description = "GPL Ghostscript, a PostScript interpreter";
+    };
+  };
+
+  variant = if gnuFork then gnuForkData else mainlineData;
+
+in
+
+stdenv.mkDerivation rec {
+  inherit (variant) name src meta;
+
+  builder = ./builder.sh;
+
   fonts = [
     (fetchurl {
       url = mirror://gnu/ghostscript/gnu-gs-fonts-std-6.0.tar.gz;
@@ -37,26 +79,8 @@ stdenv.mkDerivation rec {
 
   CFLAGS = "-fPIC";
 
-  patches = [ ./purity.patch ./urw-font-files.patch ./pstoraster.patch];
+  patches = [ ./purity.patch ./urw-font-files.patch ]
+    ++ stdenv.lib.optional gnuFork ./pstoraster.patch;
 
   doCheck = true;
-
-  meta = {
-    homepage = http://www.gnu.org/software/ghostscript/;
-    description = "GNU Ghostscript, a PostScript interpreter";
-
-    longDescription = ''
-      Ghostscript is the name of a set of tools that provides (i) an
-      interpreter for the PostScript language and the PDF file format,
-      (ii) a set of C procedures (the Ghostscript library) that
-      implement the graphics capabilities that appear as primitive
-      operations in the PostScript language, and (iii) a wide variety
-      of output drivers for various file formats and printers.
-    '';
-
-    license = "GPLv3+";
-
-    platforms = stdenv.lib.platforms.all;
-    maintainers = [ stdenv.lib.maintainers.ludo ];
-  };
 }

pkgs/top-level/all-packages.nix

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