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

java: Normalize to the default jre / jdk

Browse Source
This commit is contained in:
William A. Kennington III
2015-01-01 15:49:20 -08:00
parent bbc4262514
commit c82410eeda
20 changed files with 36 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/interpreters/octave/default.nix
View File

@@ -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)
;