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 /pkgs/development/tools/neoload | |
| parent | bbc4262514107fd6658696ddebfeba7071ac17b1 (diff) | |
| download | nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar.gz nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar.bz2 nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar.lz nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar.xz nixpkgs-c82410eeda78deb3afe898168700772d53361985.tar.zst nixpkgs-c82410eeda78deb3afe898168700772d53361985.zip | |
java: Normalize to the default jre / jdk
Diffstat (limited to 'pkgs/development/tools/neoload')
| -rw-r--r-- | pkgs/development/tools/neoload/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/tools/neoload/default.nix b/pkgs/development/tools/neoload/default.nix index fc9446408de..9c781e6f757 100644 --- a/pkgs/development/tools/neoload/default.nix +++ b/pkgs/development/tools/neoload/default.nix @@ -14,8 +14,8 @@ else assert licenseAccepted; # the installer is very picky and demands 1.7.0.07 let dotInstall4j = path: writeTextFile { name = "dot-install4j"; text = '' - JRE_VERSION ${jre}${path} 1 7 0 7 - JRE_INFO ${jre}${path} 94 + JRE_VERSION ${path} 1 7 0 7 + JRE_INFO ${path} 94 ''; }; responseVarfile = writeTextFile { name = "response.varfile"; text = '' @@ -55,20 +55,20 @@ in stdenv.mkDerivation rec { sed -e 's/^if \[ -f jre.tar.gz/if false /' $src > installer chmod a+x installer - cp ${dotInstall4j ""} .install4j + cp ${dotInstall4j jre} .install4j chmod u+w .install4j sed -e "s|INSTALLDIR|$out|" ${responseVarfile} > response.varfile export HOME=`pwd` - export INSTALL4J_JAVA_HOME=${jre} + export INSTALL4J_JAVA_HOME=${jre.home} export FONTCONFIG_FILE=${fontsConf} bash -ic './installer -q -varfile response.varfile' sed -i 's/Xmx450m/Xmx900m/;s/Xss192k/Xss384k/' $out/lib/neoload/conf/agent.properties for i in $out/bin/*; do - wrapProgram $i --run 'cp ${dotInstall4j "/lib/openjdk/jre"} ~/.install4j' \ + wrapProgram $i --run 'cp ${dotInstall4j "${jre.home}/jre"} ~/.install4j' \ --run 'chmod u+w ~/.install4j' done |