diff options
author | Doron Behar <doron.behar@gmail.com> | 2020-12-10 18:46:54 +0200 |
---|---|---|
committer | Doron Behar <doron.behar@gmail.com> | 2020-12-19 10:12:18 +0200 |
commit | 456d320c7184b0d1f42b788be0e0fc8854cdd327 (patch) | |
tree | 7c6cf80d2a3c8f23f908cf017753ca6542f4dafc /pkgs/development/interpreters/octave | |
parent | f602e104b08b907d8a913aaff58de0f9bcf7d232 (diff) |
octave: Use only lib.optionals
Diffstat (limited to 'pkgs/development/interpreters/octave')
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 40 |
1 files changed, 21 insertions, 19 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 841f89b97fbd..f670dd1ba36b 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -89,23 +89,25 @@ mkDerivation rec { libwebp gl2ps ] - ++ (stdenv.lib.optionals enableQt [ + ++ stdenv.lib.optionals enableQt [ qtbase qtsvg qscintilla - ]) - ++ (stdenv.lib.optional (ghostscript != null) ghostscript) - ++ (stdenv.lib.optional (hdf5 != null) hdf5) - ++ (stdenv.lib.optional (glpk != null) glpk) - ++ (stdenv.lib.optional (suitesparse != null) suitesparse) - ++ (stdenv.lib.optional (enableJava) jdk) - ++ (stdenv.lib.optional (sundials_2 != null) sundials_2) - ++ (stdenv.lib.optional (gnuplot != null) gnuplot) - ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) - ++ (stdenv.lib.optionals (stdenv.isDarwin) [ libiconv - darwin.apple_sdk.frameworks.Accelerate - darwin.apple_sdk.frameworks.Cocoa ]) + ] + ++ stdenv.lib.optionals (ghostscript != null) [ ghostscript ] + ++ stdenv.lib.optionals (hdf5 != null) [ hdf5 ] + ++ stdenv.lib.optionals (glpk != null) [ glpk ] + ++ stdenv.lib.optionals (suitesparse != null) [ suitesparse ] + ++ stdenv.lib.optionals (enableJava) [ jdk ] + ++ stdenv.lib.optionals (sundials_2 != null) [ sundials_2 ] + ++ stdenv.lib.optionals (gnuplot != null) [ gnuplot ] + ++ stdenv.lib.optionals (python != null) [ python ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv + darwin.apple_sdk.frameworks.Accelerate + darwin.apple_sdk.frameworks.Cocoa + ] ; nativeBuildInputs = [ pkgconfig @@ -115,12 +117,12 @@ mkDerivation rec { fftwSinglePrec texinfo ] - ++ (stdenv.lib.optional (sundials_2 != null) sundials_2) - ++ (stdenv.lib.optional enableJIT llvm) - ++ (stdenv.lib.optionals enableQt [ + ++ stdenv.lib.optionals (sundials_2 != null) [ sundials_2 ] + ++ stdenv.lib.optionals enableJIT [ llvm ] + ++ stdenv.lib.optionals enableQt [ qtscript qttools - ]) + ] ; doCheck = !stdenv.isDarwin; @@ -135,7 +137,7 @@ mkDerivation rec { "--with-lapack=lapack" (if blas.isILP64 then "--enable-64" else "--disable-64") ] - ++ (if stdenv.isDarwin then [ "--enable-link-all-dependencies" ] else [ ]) + ++ stdenv.lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] ++ stdenv.lib.optionals enableReadline [ "--enable-readline" ] ++ stdenv.lib.optionals stdenv.isDarwin [ "--with-x=no" ] ++ stdenv.lib.optionals enableQt [ "--with-qt=5" ] |