Merge master into staging
This commit is contained in:
@@ -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";
|
||||
|
||||
Reference in New Issue
Block a user