diff options
| author | William A. Kennington III <william@wkennington.com> | 2015-01-01 15:49:20 -0800 |
|---|---|---|
| committer | William A. Kennington III <william@wkennington.com> | 2015-01-07 14:55:41 -0800 |
| commit | c82410eeda78deb3afe898168700772d53361985 (patch) | |
| tree | 1f7be826db3a134ad4fa765077fcdc93bab98d9f /pkgs/development/interpreters/octave | |
| parent | bbc4262514107fd6658696ddebfeba7071ac17b1 (diff) | |
| download | nixlib-c82410eeda78deb3afe898168700772d53361985.tar nixlib-c82410eeda78deb3afe898168700772d53361985.tar.gz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.bz2 nixlib-c82410eeda78deb3afe898168700772d53361985.tar.lz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.xz nixlib-c82410eeda78deb3afe898168700772d53361985.tar.zst nixlib-c82410eeda78deb3afe898168700772d53361985.zip | |
java: Normalize to the default jre / jdk
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 d302a2a6e183..7545e80fd117 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -2,7 +2,7 @@ , libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null -, suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null +, suitesparse ? null, gnuplot ? null, jdk ? null, python ? null }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (hdf5 != null) hdf5) ++ (stdenv.lib.optional (glpk != null) glpk) ++ (stdenv.lib.optional (suitesparse != null) suitesparse) - ++ (stdenv.lib.optional (openjdk != null) openjdk) + ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) ; |