diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:29:54 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-02-16 09:29:54 +0100 |
| commit | 6fe10d27799c284c72876f792c7b12d7fa54602b (patch) | |
| tree | b3594f3899a031eca0563cf36c4813f60b6c76e9 /pkgs/misc | |
| parent | 5a322693f4de4763e951f5df3f0026e914957ae4 (diff) | |
| parent | 039f359a7d366e6d8594a4238aac6fcb4dbd7be8 (diff) | |
| download | nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.gz nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.bz2 nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.lz nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.xz nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.tar.zst nixpkgs-6fe10d27799c284c72876f792c7b12d7fa54602b.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 722f5344905..cd944a6788f 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,12 +1,13 @@ -{ stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs -, x11Support ? false, xlibsWrapper ? null -, cupsSupport ? false, cups ? null +, cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null +, x11Support ? cupsSupport, xlibsWrapper ? null # with CUPS, X11 only adds very little }: assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; + let version = "9.${ver_min}"; ver_min = "26"; |