diff options
Diffstat (limited to 'pkgs/top-level/all-packages.nix')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4f9ce8f3afa85..9e7d1b813ef38 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1362,7 +1362,7 @@ let grafx2 = callPackage ../applications/graphics/grafx2 {}; grails = callPackage ../development/web/grails { - jdkPath = "${openjdk}/lib/openjdk"; + jdkPath = jdk.home; }; graphviz = callPackage ../tools/graphics/graphviz { }; @@ -3445,7 +3445,7 @@ let icedtea7_jdk = callPackage ../development/compilers/icedtea rec { jdk = openjdk; - jdkPath = "${openjdk}/lib/openjdk"; + jdkPath = openjdk.home; giflib = giflib_5_0; } // { outputs = [ "out" ]; }; @@ -7617,7 +7617,7 @@ let cassandra = callPackage ../servers/nosql/cassandra { }; apache-jena = callPackage ../servers/nosql/apache-jena/binary.nix { - java = icedtea_jdk; + java = jdk; }; apcupsd = callPackage ../servers/apcupsd { }; @@ -11265,9 +11265,7 @@ let vorbisTools = callPackage ../applications/audio/vorbis-tools { }; - vue = callPackage ../applications/misc/vue { - jre = icedtea_jre; - }; + vue = callPackage ../applications/misc/vue { }; vwm = callPackage ../applications/window-managers/vwm { }; |