diff options
| author | adisbladis <adisbladis@gmail.com> | 2019-11-07 16:30:37 +0000 |
|---|---|---|
| committer | adisbladis <adisbladis@gmail.com> | 2019-11-09 10:34:49 +0000 |
| commit | d053944e7baadffd3e443ff7e76c87be86cc0d53 (patch) | |
| tree | c4d1628c74b05ba3bb83f3e55ccfa5faa2ac9991 /pkgs/development/interpreters/octave | |
| parent | 5e433b48dc48d56040baf87a603a8f0ac15e0f7a (diff) | |
| download | nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar.gz nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar.bz2 nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar.lz nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar.xz nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.tar.zst nixlib-d053944e7baadffd3e443ff7e76c87be86cc0d53.zip | |
octave: Don't use libGLU_combined
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 cc9f6fcc3c90..66f717385371 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 , 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 |