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/science/math/scilab | |
| parent | 47ad941fbfe752f679d6bc577d2408f79aee7054 (diff) | |
| download | nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.gz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.bz2 nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.lz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.xz nixlib-21e3ff658ac2d7b7986169f31550aa5f65bb7635.tar.zst nixlib-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/applications/science/math/scilab')
| -rw-r--r-- | pkgs/applications/science/math/scilab/default.nix | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/pkgs/applications/science/math/scilab/default.nix b/pkgs/applications/science/math/scilab/default.nix index bbb34e08c468..8482bd6fe94b 100644 --- a/pkgs/applications/science/math/scilab/default.nix +++ b/pkgs/applications/science/math/scilab/default.nix @@ -8,7 +8,7 @@ , ocaml, withOCaml ? false #, withJava ? false #, atlasMath, withAtlas ? false -, x11, withX ? false +, xlibsWrapper, withX ? false }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran ncurses] ++ lib.optionals withGtk [gtk] ++ lib.optionals withOCaml [ocaml] - ++ lib.optionals withX [x11] + ++ lib.optional withX xlibsWrapper ; @@ -58,11 +58,7 @@ stdenv.mkDerivation rec { # do not compile Java interface + " --without-java" # use the X Window System - + (lib.optionalString withX " - --with-x - --x-libraries=${x11}/lib - --x-includes=${x11}/include - ") + + lib.optionalString withX "--with-x" ; makeFlags = "all"; |