java: Normalize to the default jre / jdk

This commit is contained in:
William A. Kennington III
2015-01-07 14:55:41 -08:00
parent bbc4262514
commit c82410eeda
20 changed files with 36 additions and 42 deletions
+3 -3
View File
@@ -1,5 +1,5 @@
{ stdenv, fetchurl, makeWrapper, which, coreutils, rrdtool, perl, perlPackages
, python, ruby, openjdk, nettools
, python, ruby, jre, nettools
}:
stdenv.mkDerivation rec {
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
perlPackages.DBDPg
python
ruby
openjdk
jre
# tests
perlPackages.TestLongString
perlPackages.TestDifferences
@@ -91,7 +91,7 @@ stdenv.mkDerivation rec {
PERL=${perl}/bin/perl
PYTHON=${python}/bin/python
RUBY=${ruby}/bin/ruby
JAVARUN=${openjdk}/bin/java
JAVARUN=${jre}/bin/java
PLUGINUSER=munin
'';