diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2019-12-08 18:09:08 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-08 18:09:08 +0000 |
| commit | 06346a12a0bd59b77f08707a3bfeaad9f131b112 (patch) | |
| tree | e46a1e2db9c88135cc978f34c060f805e91a3a68 /pkgs/development/interpreters/octave | |
| parent | 62e0c07836f547c00770031deaed8ba76e4b1949 (diff) | |
| parent | 76c867afde1d30d49c4899d6eedb1d8abe520acb (diff) | |
Merge branch 'master' into octave-gl2ps
Diffstat (limited to 'pkgs/development/interpreters/octave')
| -rw-r--r-- | pkgs/development/interpreters/octave/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 0a5d92206d9d..eb9827969e12 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGL, libGLU, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp, gl2ps , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGL libGLU libX11 ]) ; # makeinfo is required by Octave at runtime to display help |