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:49 +02:00
parent c19136b1cd
commit a3f6a4b9b6
2 changed files with 15 additions and 6 deletions
+8 -6
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