diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 11:13:22 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2015-09-15 12:08:24 +0200 |
| commit | 21e3ff658ac2d7b7986169f31550aa5f65bb7635 (patch) | |
| tree | a23f824d60d9aad34473c8828278c0fdba2dc188 /pkgs/misc/ghostscript | |
| parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
| download | nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixpkgs-21e3ff658ac2d7b7986169f31550aa5f65bb7635.zip | |
x11: replace its usage by xlibsWrapper directly
Scilab note: the parameters already had pointed to nonexistent dirs before this set of refactoring. But that config wasn't even used by default.
Diffstat (limited to 'pkgs/misc/ghostscript')
| -rw-r--r-- | pkgs/misc/ghostscript/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 4d9d9cedde5..9f930900c41 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, zlib, expat, openssl , libjpeg, libpng, libtiff, freetype, fontconfig, lcms2, libpaper, jbig2dec , libiconv -, x11Support ? false, x11 ? null +, x11Support ? false, xlibsWrapper ? null , cupsSupport ? false, cups ? null }: -assert x11Support -> x11 != null; +assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let version = "9.15"; @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { libjpeg libpng libtiff freetype fontconfig lcms2 libpaper jbig2dec libiconv ] - ++ stdenv.lib.optional x11Support x11 + ++ stdenv.lib.optional x11Support xlibsWrapper ++ stdenv.lib.optional cupsSupport cups # [] # maybe sometimes jpeg2000 support ; |