diff options
| author | Eric Seidel <gridaphobe@gmail.com> | 2014-11-26 15:16:50 -0800 |
|---|---|---|
| committer | Eric Seidel <gridaphobe@gmail.com> | 2015-02-07 20:29:28 -0800 |
| commit | e08b9ab8d3d6362c774a786797347fa7483af773 (patch) | |
| tree | f64e5ce1224cb2cb8d5cfa0840bbb86daa68ecc3 /pkgs/misc/ghostscript | |
| parent | 362d75975045c185e67cb0b66baa43d4d5e337c4 (diff) | |
kill libiconvOr*
Conflicts:
pkgs/applications/networking/mailreaders/sup/default.nix
pkgs/development/compilers/ghc/7.8.3-binary.nix
pkgs/development/interpreters/php/5.3.nix
pkgs/development/interpreters/ruby/patches.nix
pkgs/development/libraries/cairo/default.nix
pkgs/development/libraries/poppler/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/misc/ghostscript')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 9e753d8f8302..c521e156f8e2 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, zlib, expat, openssl , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec -, libiconvOrEmpty +, libiconv , x11Support ? false, x11 ? null , cupsSupport ? false, cups ? null }: @@ -33,10 +33,10 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig zlib expat openssl libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec + libiconv ] ++ stdenv.lib.optional x11Support x11 ++ stdenv.lib.optional cupsSupport cups - ++ libiconvOrEmpty # [] # maybe sometimes jpeg2000 support ; |