diff options
| author | Doron Behar <doron.behar@gmail.com> | 2020-02-19 18:39:39 +0200 |
|---|---|---|
| committer | Doron Behar <doron.behar@gmail.com> | 2020-02-22 12:35:06 +0200 |
| commit | 62d7ad930993813a05f277bd9091f6ab2e3b9e80 (patch) | |
| tree | d0a587ce728d0e259593fc13241139ff311e9e4e /pkgs/development/interpreters/octave | |
| parent | b631f620d46d2a6103ad8ba4de4ba40152cf3741 (diff) | |
| download | nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar.gz nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar.bz2 nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar.lz nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar.xz nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.tar.zst nixlib-62d7ad930993813a05f277bd9091f6ab2e3b9e80.zip | |
octave: Use sundials_2 in package's signature instead of callPackage
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 78f927dc4ee7..2e926e16dc6e 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -34,7 +34,7 @@ , jdk ? null , python ? null , overridePlatforms ? null -, sundials ? null +, sundials_2 ? null # Qt / GUI is disabled by default , enableQt ? false , qtbase ? null @@ -99,7 +99,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (glpk != null) glpk) ++ (stdenv.lib.optional (suitesparse != null) suitesparse) ++ (stdenv.lib.optional (jdk != null) jdk) - ++ (stdenv.lib.optional (sundials != null) sundials) + ++ (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 ]) @@ -112,7 +112,7 @@ stdenv.mkDerivation rec { fftwSinglePrec texinfo ] - ++ (stdenv.lib.optional (sundials != null) sundials) + ++ (stdenv.lib.optional (sundials_2 != null) sundials_2) ++ (stdenv.lib.optional enableJIT llvm) ++ (stdenv.lib.optionals enableQt [ qtscript |