diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-01-23 12:40:13 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-01-23 12:40:13 +0000 |
commit | 58752914f4b22a570ff7cba694df86aef20e255a (patch) | |
tree | 13ed5492ea1c875253d18c4bcb981f9effe11ee2 /pkgs/development/interpreters | |
parent | f6c56619d7aa645772bf160c048b36d2269508c6 (diff) | |
parent | 10a27d6d5296619de1a05538cd1d5b81b612b225 (diff) | |
download | nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar.gz nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar.bz2 nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar.lz nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar.xz nixlib-58752914f4b22a570ff7cba694df86aef20e255a.tar.zst nixlib-58752914f4b22a570ff7cba694df86aef20e255a.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 7dedf79c340f..6ad25d24eae6 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,4 +1,5 @@ { stdenv +, lib # Note: either stdenv.mkDerivation or, for octaveFull, the qt-5 mkDerivation # with wrapQtAppsHook (comes from libsForQt5.callPackage) , mkDerivation @@ -124,21 +125,21 @@ in mkDerivation rec { libwebp gl2ps ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals enableQt [ qtbase qtsvg qscintilla ] - ++ 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 != null) [ sundials ] - ++ 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 [ + ++ lib.optionals (ghostscript != null) [ ghostscript ] + ++ lib.optionals (hdf5 != null) [ hdf5 ] + ++ lib.optionals (glpk != null) [ glpk ] + ++ lib.optionals (suitesparse != null) [ suitesparse' ] + ++ lib.optionals (enableJava) [ jdk ] + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals (gnuplot != null) [ gnuplot ] + ++ lib.optionals (python != null) [ python ] + ++ lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ] + ++ lib.optionals stdenv.isDarwin [ libiconv darwin.apple_sdk.frameworks.Accelerate darwin.apple_sdk.frameworks.Cocoa @@ -152,9 +153,9 @@ in mkDerivation rec { fftwSinglePrec texinfo ] - ++ stdenv.lib.optionals (sundials != null) [ sundials ] - ++ stdenv.lib.optionals enableJIT [ llvm ] - ++ stdenv.lib.optionals enableQt [ + ++ lib.optionals (sundials != null) [ sundials ] + ++ lib.optionals enableJIT [ llvm ] + ++ lib.optionals enableQt [ qtscript qttools ] @@ -172,11 +173,11 @@ in mkDerivation rec { "--with-lapack=lapack" (if use64BitIdx then "--enable-64" else "--disable-64") ] - ++ 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" ] - ++ stdenv.lib.optionals enableJIT [ "--enable-jit" ] + ++ lib.optionals stdenv.isDarwin [ "--enable-link-all-dependencies" ] + ++ lib.optionals enableReadline [ "--enable-readline" ] + ++ lib.optionals stdenv.isDarwin [ "--with-x=no" ] + ++ lib.optionals enableQt [ "--with-qt=5" ] + ++ lib.optionals enableJIT [ "--enable-jit" ] ; # Keep a copy of the octave tests detailed results in the output @@ -198,13 +199,13 @@ in mkDerivation rec { meta = { homepage = "https://www.gnu.org/software/octave/"; - license = stdenv.lib.licenses.gpl3Plus; - maintainers = with stdenv.lib.maintainers; [ raskin doronbehar ]; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ raskin doronbehar ]; description = "Scientific Pragramming Language"; # https://savannah.gnu.org/bugs/?func=detailitem&item_id=56425 is the best attempt to fix JIT broken = enableJIT; platforms = if overridePlatforms == null then - (with stdenv.lib; platforms.linux ++ platforms.darwin) + (lib.platforms.linux ++ lib.platforms.darwin) else overridePlatforms; }; } |