diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 18:50:15 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2018-09-04 18:50:49 +0200 |
| commit | a3f6a4b9b6c7fe800af23b2744000c7d5b3a5d02 (patch) | |
| tree | 3ca577d4f1c34d3a4116ac41b8ccdbbc8bc32599 /pkgs/misc/ghostscript | |
| parent | c19136b1cda1ae95430ae27fceb2223064d7cfae (diff) | |
ghostscript: fix nitpicks after the update
- unused lcms2 input
- reference $out -> $doc
Diffstat (limited to 'pkgs/misc/ghostscript')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/misc/ghostscript/doc-no-ref.diff | 7 |
2 files changed, 15 insertions, 6 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 42e5e5c379c8..54ad32622756 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -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 diff --git a/pkgs/misc/ghostscript/doc-no-ref.diff b/pkgs/misc/ghostscript/doc-no-ref.diff new file mode 100644 index 000000000000..7380ba2f9953 --- /dev/null +++ b/pkgs/misc/ghostscript/doc-no-ref.diff @@ -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 |