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/applications/misc/xpdf | |
parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) |
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/applications/misc/xpdf')
-rw-r--r-- | pkgs/applications/misc/xpdf/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 2e690dcce0909..e677164ecf484 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, xlibsWrapper ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: -assert enableGUI -> x11 != null && motif != null && freetype != null; +assert enableGUI -> xlibsWrapper != null && motif != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -18,7 +18,7 @@ stdenv.mkDerivation { }; buildInputs = [ zlib libpng ] ++ - stdenv.lib.optionals enableGUI [x11 motif] ++ + stdenv.lib.optionals enableGUI [xlibsWrapper motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; |