From d064592f368a26fb4860edeaa870d6b769597bba Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Sun, 3 Feb 2019 15:30:19 +0000 Subject: ghostscript: move defaults to package file --- pkgs/misc/ghostscript/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'pkgs/misc') 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"; -- cgit 1.4.1