public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

octave: Use sundials_2 in package's signature instead of callPackage

Browse Source
This commit is contained in:
Doron Behar
2020-02-22 12:35:06 +02:00
parent b631f620d4
commit 62d7ad9309
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/octave/default.nix
+3 -3
View File
@@ -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