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 /nixos | |
| 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 'nixos')
| -rw-r--r-- | nixos/modules/services/monitoring/riemann.nix | 2 | ||||
| -rw-r--r-- | nixos/modules/services/search/solr.nix | 2 | ||||
| -rw-r--r-- | nixos/release-small.nix | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index ab37d717b86d..ac5d0134a80d 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -17,7 +17,7 @@ let launcher = writeScriptBin "riemann" '' #!/bin/sh - exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ + exec ${jdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ -cp ${classpath} \ riemann.bin ${writeText "riemann-config.clj" riemannConfig} ''; diff --git a/nixos/modules/services/search/solr.nix b/nixos/modules/services/search/solr.nix index 38d9dedbe3cf..bc5cbe83cff6 100644 --- a/nixos/modules/services/search/solr.nix +++ b/nixos/modules/services/search/solr.nix @@ -22,7 +22,7 @@ let cp common/lib/*.jar $out/lib/ ln -s ${pkgs.ant}/lib/ant/lib/ant.jar $out/lib/ ln -s ${cfg.solrPackage}/lib/ext/* $out/lib/ - ln -s ${pkgs.openjdk}/lib/openjdk/lib/tools.jar $out/lib/ + ln -s ${pkgs.jdk.home}/lib/tools.jar $out/lib/ '' + optionalString (cfg.extraJars != []) '' for f in ${concatStringsSep " " cfg.extraJars}; do cp $f $out/lib diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 07cd672843ea..7f53a101bdfc 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -61,12 +61,12 @@ in rec { gettext git imagemagick + jdk linux mysql51 mysql55 nginx nodejs - openjdk openssh php postgresql92 |