forked from mirrors/nixpkgs
* ghostscript: force the use of the -fpic flag, otherwise it doesn't
build on x86_64-linux. svn path=/nixpkgs/trunk/; revision=12380
This commit is contained in:
parent
f1d9c0a852
commit
8734e020db
pkgs/misc/ghostscript
|
@ -6,7 +6,6 @@ preConfigure() {
|
||||||
rm -rf ijs/ltmain.sh
|
rm -rf ijs/ltmain.sh
|
||||||
}
|
}
|
||||||
|
|
||||||
installPhase=installPhase
|
|
||||||
installPhase() {
|
installPhase() {
|
||||||
make install install-so install-data install-doc install-man
|
make install install-so install-data install-doc install-man
|
||||||
}
|
}
|
||||||
|
|
|
@ -6,6 +6,7 @@ assert x11Support -> x11 != null;
|
||||||
|
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "ghostscript-8.62.0";
|
name = "ghostscript-8.62.0";
|
||||||
|
|
||||||
builder = ./builder.sh;
|
builder = ./builder.sh;
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
|
@ -25,15 +26,16 @@ stdenv.mkDerivation rec {
|
||||||
# ... add other fonts here
|
# ... add other fonts here
|
||||||
];
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [libjpeg libpng zlib]
|
||||||
libjpeg libpng zlib
|
++ stdenv.lib.optional x11Support x11;
|
||||||
(if x11Support then x11 else null)
|
|
||||||
];
|
|
||||||
|
|
||||||
configureFlags = "
|
configureFlags = "
|
||||||
|
--disable-static
|
||||||
${if x11Support then "--with-x" else "--without-x"}
|
${if x11Support then "--with-x" else "--without-x"}
|
||||||
";
|
";
|
||||||
|
|
||||||
|
NIX_CFLAGS_COMPILE = "-fpic";
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
|
||||||
# This patch is required to make Ghostscript at least build in a
|
# This patch is required to make Ghostscript at least build in a
|
||||||
|
|
Loading…
Reference in a new issue