ghostscript: fix nitpicks after the update

- unused lcms2 input
- reference $out -> $doc
This commit is contained in:
Vladimír Čunát 2018-09-04 18:50:15 +02:00
parent c19136b1cd
commit a3f6a4b9b6
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
2 changed files with 15 additions and 6 deletions

View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf
, libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec
, libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec
, libiconv, ijs
, x11Support ? false, xlibsWrapper ? null
, cupsSupport ? false, cups ? null
@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
inherit sha512;
};
patches = [
./urw-font-files.patch
./doc-no-ref.diff
];
outputs = [ "out" "man" "doc" ];
enableParallelBuilding = true;
@ -50,16 +55,13 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ pkgconfig autoconf ];
buildInputs =
[ zlib expat openssl
libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec
libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec
libiconv ijs
]
++ lib.optional x11Support xlibsWrapper
++ lib.optional cupsSupport cups
;
patches = [
./urw-font-files.patch
];
# No lcms2; upstream "is in process of forking it" and thus won't use one from a library.
preConfigure = ''
# requires in-tree (heavily patched) openjpeg

View file

@ -0,0 +1,7 @@
Kill the reference from libgc.so to the documentation directory.
It's bad for closure, and probably not really good for anything.
--- a/base/gs.mak
+++ b/base/gs.mak
@@ -538,1 +538,1 @@
- $(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 $(GS_DOCDIR) -x 22
+ $(EXP)$(ECHOGS_XE) -a $(gconfigd_h) -x 23 define -s -u GS_DOCDIR -x 2022 /no-path-to-docs -x 22