diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-07-18 14:52:20 +0000 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-07-18 14:52:20 +0000 |
commit | 8734e020db92bb0102f30a87f402e1d23d948f4f (patch) | |
tree | 080630348d3e3707b9b816a90266fe25ee551f4e /pkgs/misc/ghostscript | |
parent | f1d9c0a8523f9103e408a5b9b7b81629803c4839 (diff) | |
download | nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar.gz nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar.bz2 nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar.lz nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar.xz nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.tar.zst nixlib-8734e020db92bb0102f30a87f402e1d23d948f4f.zip |
* ghostscript: force the use of the -fpic flag, otherwise it doesn't
build on x86_64-linux. svn path=/nixpkgs/trunk/; revision=12380
Diffstat (limited to 'pkgs/misc/ghostscript')
-rw-r--r-- | pkgs/misc/ghostscript/builder.sh | 1 | ||||
-rw-r--r-- | pkgs/misc/ghostscript/default.nix | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/pkgs/misc/ghostscript/builder.sh b/pkgs/misc/ghostscript/builder.sh index 41b071126822..a1f84f3d80d1 100644 --- a/pkgs/misc/ghostscript/builder.sh +++ b/pkgs/misc/ghostscript/builder.sh @@ -6,7 +6,6 @@ preConfigure() { rm -rf ijs/ltmain.sh } -installPhase=installPhase installPhase() { make install install-so install-data install-doc install-man } diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index c3120d04bb72..1c0c82a94a33 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -6,6 +6,7 @@ assert x11Support -> x11 != null; stdenv.mkDerivation rec { name = "ghostscript-8.62.0"; + builder = ./builder.sh; src = fetchurl { @@ -25,15 +26,16 @@ stdenv.mkDerivation rec { # ... add other fonts here ]; - buildInputs = [ - libjpeg libpng zlib - (if x11Support then x11 else null) - ]; + buildInputs = [libjpeg libpng zlib] + ++ stdenv.lib.optional x11Support x11; configureFlags = " + --disable-static ${if x11Support then "--with-x" else "--without-x"} "; + NIX_CFLAGS_COMPILE = "-fpic"; + patches = [ # This patch is required to make Ghostscript at least build in a |