ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-29 06:45:54 +03:00
Code Issues Projects Releases Wiki Activity

ghostscript: move defaults to package file

Browse Source
This commit is contained in:
Jan Malakhovski 2019-02-03 15:30:19 +00:00
parent 5da88a18c9
commit d064592f36
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/misc/ghostscript/default.nix
View File

@ -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";

5
pkgs/top-level/all-packages.nix
View File

@ -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;