colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updating GPL Ghostscript.

Browse Source 
svn path=/nixpkgs/trunk/; revision=32914
This commit is contained in:
Lluís Batlle i Rossell 2012-03-08 22:28:26 +00:00
parent 47e76fde88
commit e277e44e34
2 changed files with 33 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/misc/ghostscript/default.nix
View File

@ -35,18 +35,20 @@ let
};
inherit meta;
patches = [ ./purity.patch ];
};
mainlineData = {
name = "ghostscript-9.04";
name = "ghostscript-9.05";
src = fetchurl {
url = http://downloads.ghostscript.com/public/ghostscript-9.04.tar.bz2;
sha256 = "1i0bsfzwppzk112vy62ydz927m9dlc1wvywanzi09hnk9as20b7q";
url = http://downloads.ghostscript.com/public/ghostscript-9.05.tar.bz2;
sha256 = "1b6fi76x6pn9dmr9k9lh8kimn968dmh91k824fmm59d5ycm22h8g";
};
meta = meta // {
homepage = http://www.ghostscript.com/;
description = "GPL Ghostscript, a PostScript interpreter";
};
patches = [ ./purity-9.05.patch ];
};
variant = if gnuFork then gnuForkData else mainlineData;
@ -75,7 +77,7 @@ stdenv.mkDerivation rec {
CFLAGS = "-fPIC";
NIX_LDFLAGS = "-lz -rpath=${freetype}/lib";
patches = [ ./purity.patch ./urw-font-files.patch ];
patches = variant.patches ++ [ ./urw-font-files.patch ];
preConfigure = ''
# "ijs" is impure: it contains symlinks to /usr/share/automake etc.!

27
pkgs/misc/ghostscript/purity-9.05.patch Normal file
View File

@ -0,0 +1,27 @@
diff --git a/base/unix-aux.mak b/base/unix-aux.mak
index 18745bc..0a67942 100644
--- a/base/unix-aux.mak
+++ b/base/unix-aux.mak
@@ -111,15 +111,15 @@ $(MKROMFS_XE): $(MKROMFS_XE)_$(SHARE_ZLIB) $(MAKEDIRS)
# 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 ifndef HAVE_SYS_TIME_H ; \
+ 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 ifndef HAVE_SYS_TIME_H ; \
$(ECHOGS_XE) -a $(gconfig__h) -x 23 define HAVE_SYS_TIME_H ; \
$(ECHOGS_XE) -a $(gconfig__h) -x 23 endif; 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_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