ghostscript: drop GNU fork and update

This commit is contained in:
Nikolay Amiantov 2014-11-05 05:26:53 +03:00
parent 4d59ac9e67
commit e723c512c5
3 changed files with 43 additions and 99 deletions

View file

@ -3,69 +3,18 @@
, libiconvOrEmpty
, x11Support ? false, x11 ? null
, cupsSupport ? false, cups ? null
, gnuFork ? true
}:
assert x11Support -> x11 != null;
assert cupsSupport -> cups != null;
let
meta_common = {
homepage = "http://www.gnu.org/software/ghostscript/";
description = "PostScript interpreter (GNU version)";
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 = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.viric ];
};
gnuForkSrc = rec {
name = "ghostscript-9.04.1";
src = fetchurl {
url = "mirror://gnu/ghostscript/gnu-${name}.tar.bz2";
sha256 = "0zqa6ggbkdqiszsywgrra4ij0sddlmrfa50bx2mh568qid4ga0a2";
};
meta = meta_common;
patches = [ ./purity.patch ];
};
mainlineSrc = rec {
name = "ghostscript-9.06";
src = fetchurl {
url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
sha256 = "014f10rxn4ihvcr1frby4szd1jvkrwvmdhnbivpp55c9fssx3b05";
};
meta = meta_common // {
homepage = "http://www.ghostscript.com/";
description = "PostScript interpreter (mainline version)";
};
preConfigure = ''
rm -R libpng jpeg lcms{,2} tiff freetype jbig2dec expat openjpeg
substituteInPlace base/unix-aux.mak --replace "INCLUDE=/usr/include" "INCLUDE=/no-such-path"
sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@" -i base/unix-aux.mak
'';
patches = [];
};
variant = if gnuFork then gnuForkSrc else mainlineSrc;
in
stdenv.mkDerivation rec {
inherit (variant) name src meta;
name = "ghostscript-9.15";
src = fetchurl {
url = "http://downloads.ghostscript.com/public/${name}.tar.bz2";
sha256 = "0p1isp6ssfay141klirn7n9s8b546vcz6paksfmksbwy0ljsypg6";
};
fonts = [
(fetchurl {
@ -91,34 +40,56 @@ stdenv.mkDerivation rec {
# [] # maybe sometimes jpeg2000 support
;
CFLAGS = "-fPIC";
NIX_LDFLAGS =
"-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib";
patches = [ ./urw-font-files.patch ];
patches = variant.patches ++ [ ./urw-font-files.patch ];
preConfigure = ''
# "ijs" is impure: it contains symlinks to /usr/share/automake etc.!
rm -rf ijs/ltmain.sh
# 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;
makeFlags = [ "cups_serverroot=$(out)" "cups_serverbin=$(out)/lib/cups" ];
configureFlags =
[ "--with-system-libtiff"
[ "--with-system-libtiff" "--disable-sse2"
"--enable-dynamic"
(if x11Support then "--with-x" else "--without-x")
(if cupsSupport then "--enable-cups --with-install-cups" else "--disable-cups")
(if cupsSupport then "--enable-cups" else "--disable-cups")
];
doCheck = true;
installTargets="install soinstall";
# ToDo: web says the fonts should be already included
#CFLAGS = "-fPIC";
#NIX_LDFLAGS =
# "-lz -rpath${ if stdenv.isDarwin then " " else "="}${freetype}/lib";
preConfigure = ''
rm -rf jpeg libpng zlib jasper expat tiff lcms{,2} jbig2dec openjpeg freetype cups/libs
sed "s@if ( test -f \$(INCLUDE)[^ ]* )@if ( true )@; s@INCLUDE=/usr/include@INCLUDE=/no-such-path@" -i base/unix-aux.mak
'';
postInstall = ''
# ToDo: web says the fonts should be already included
for i in $fonts; do
(cd $out/share/ghostscript && tar xvfz $i)
done
rm -rf $out/lib/cups/filter/{gstopxl,gstoraster}
'';
meta = {
homepage = "http://www.ghostscript.com/";
description = "PostScript interpreter (mainline version)";
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 = stdenv.lib.licenses.gpl3Plus;
platforms = stdenv.lib.platforms.all;
maintainers = [ stdenv.lib.maintainers.viric ];
};
}

View file

@ -1,26 +0,0 @@
Don't look for files under `/usr/include' since we don't have that directory
under NixOS.
--- gnu-ghostscript-8.64.0/base/unix-aux.mak 2009-04-19 19:00:20.000000000 +0200
+++ gnu-ghostscript-8.64.0/base/unix-aux.mak 2009-04-27 11:58:31.000000000 +0200
@@ -103,13 +103,13 @@ $(MKROMFS_XE): $(GLSRC)mkromfs.c $(MKROM
# The "else true;" is required because Ultrix's implementation of sh -e
# terminates execution of a command if any error occurs, even if the command
# traps the error with ||.
-INCLUDE=/usr/include
+INCLUDE=/no-such-path
$(gconfig__h): $(UNIX_AUX_MAK) $(ECHOGS_XE)
$(ECHOGS_XE) -w $(gconfig__h) -x 2f2a -s This file was generated automatically by unix-aux.mak. -s -x 2a2f
- if ( test -f $(INCLUDE)/dirent.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi
- if ( test -f $(INCLUDE)/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi
- if ( test -f $(INCLUDE)/sys/dir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi
- if ( test -f $(INCLUDE)/sys/ndir.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi
- if ( test -f $(INCLUDE)/sys/time.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H; else true; fi
- if ( test -f $(INCLUDE)/sys/times.h ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_DIRENT_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_NDIR_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_DIR_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_NDIR_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H; else true; fi
+ if ( true ); then $(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIMES_H; else true; fi
if ( test -f $(JSRCDIR)/jmemsys.h); then true; else $(ECHOGS_XE) -a $(gconfig__h) -x 23 define DONT_HAVE_JMEMSYS_H; fi

View file

@ -12363,7 +12363,6 @@ let
ghostscript = callPackage ../misc/ghostscript {
x11Support = false;
cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin);
gnuFork = config.ghostscript.gnu or false;
};
ghostscriptX = appendToName "with-X" (ghostscript.override {