java: Correct more missed normalizations

This commit is contained in:
William A. Kennington III 2015-01-02 00:30:48 -08:00
parent 238f4d1652
commit 770d5947b0

View File

@ -4129,7 +4129,7 @@ let
hdf5 = null; hdf5 = null;
glpk = null; glpk = null;
suitesparse = null; suitesparse = null;
openjdk = null; jdk = null;
gnuplot = null; gnuplot = null;
}; };
octaveFull = (lowPrio (callPackage ../development/interpreters/octave { octaveFull = (lowPrio (callPackage ../development/interpreters/octave {
@ -4690,7 +4690,7 @@ let
lttv = callPackage ../development/tools/misc/lttv { }; lttv = callPackage ../development/tools/misc/lttv { };
maven = maven3; maven = maven3;
maven3 = callPackage ../development/tools/build-managers/apache-maven { jdk = openjdk; }; maven3 = callPackage ../development/tools/build-managers/apache-maven { };
mk = callPackage ../development/tools/build-managers/mk { }; mk = callPackage ../development/tools/build-managers/mk { };
@ -10244,7 +10244,6 @@ let
inherit (perlPackages) ArchiveZip CompressZlib; inherit (perlPackages) ArchiveZip CompressZlib;
inherit (gnome) GConf ORBit2 gnome_vfs; inherit (gnome) GConf ORBit2 gnome_vfs;
zip = zip.override { enableNLS = false; }; zip = zip.override { enableNLS = false; };
jdk = openjdk;
boost = boost155; boost = boost155;
glm = glm_0954; glm = glm_0954;
fontsConf = makeFontsConf { fontsConf = makeFontsConf {