Author: viric
Date: Tue May 24 15:35:38 2011
New Revision: 27297
URL: https://svn.nixos.org/websvn/nix/?rev=27297&sc=1
Log:
Adding mainline ghostscript as an option.
Modified:
nixpkgs/trunk/pkgs/misc/ghostscript/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/misc/ghostscript/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/misc/ghostscript/default.nix Tue May 24 15:23:04
2011 (r27296)
+++ nixpkgs/trunk/pkgs/misc/ghostscript/default.nix Tue May 24 15:35:38
2011 (r27297)
@@ -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 {
- name = "ghostscript-8.71.1";
+let
+ meta = {
+ homepage = http://www.gnu.org/software/ghostscript/;
+ description = "GNU Ghostscript, a PostScript interpreter";
- builder = ./builder.sh;
+ 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+";
- src = fetchurl {
- url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
- sha256 = "0vab9905h6sl5s5miai4vhhwdacjlkxqmykfr42x32sr25wjqgvl";
+ platforms = stdenv.lib.platforms.all;
+ maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.viric ];
};
+ gnuForkData = rec {
+ name = "ghostscript-8.71.1";
+ 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 @@
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 ];
- };
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 24 15:23:04
2011 (r27296)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Tue May 24 15:35:38
2011 (r27297)
@@ -7804,6 +7804,7 @@
ghostscript = callPackage ../misc/ghostscript {
x11Support = false;
cupsSupport = getConfig [ "ghostscript" "cups" ] true;
+ gnuFork = getConfig [ "ghostscript" "gnu" ] true;
};
ghostscriptX = appendToName "with-X" (ghostscript.override {
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
