diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:19 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2019-02-03 15:30:19 +0000 |
| commit | d064592f368a26fb4860edeaa870d6b769597bba (patch) | |
| tree | c3eb77e761798ecec5921b034704f807bf31bfa3 /pkgs | |
| parent | 5da88a18c9fc30d3926c1ff10acfa1082abaddcc (diff) | |
| download | nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar.gz nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar.bz2 nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar.lz nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar.xz nixlib-d064592f368a26fb4860edeaa870d6b769597bba.tar.zst nixlib-d064592f368a26fb4860edeaa870d6b769597bba.zip | |
ghostscript: move defaults to package file
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 5 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 722f5344905f..cd944a6788f3 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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db91b61ac35b..98d98e9e524e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22347,10 +22347,7 @@ in gensgs = pkgsi686Linux.callPackage ../misc/emulators/gens-gs { }; - ghostscript = callPackage ../misc/ghostscript rec { - cupsSupport = config.ghostscript.cups or (!stdenv.isDarwin); - x11Support = cupsSupport; # with CUPS, X11 only adds very little - }; + ghostscript = callPackage ../misc/ghostscript { }; ghostscriptX = appendToName "with-X" (ghostscript.override { cupsSupport = true; |