fixing wrappers in ant-build

svn path=/nixpkgs/trunk/; revision=24637
This commit is contained in:
Rob Vermaas 2010-11-10 12:55:25 +00:00
parent a26788440d
commit cf8da224c6

View File

@ -52,12 +52,13 @@ stdenv.mkDerivation (
generateWrappersPhase = generateWrappersPhase =
let let
cp = w: "-cp ${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/${w.jar}"}"; cp = w: "-cp '${lib.optionalString (w ? classPath) w.classPath}${lib.optionalString (w ? mainClass) ":$out/lib/java/*"}'";
in in
'' ''
header "Generating jar wrappers" header "Generating jar wrappers"
'' + (stdenv.lib.concatMapStrings (w: '' '' + (stdenv.lib.concatMapStrings (w: ''
ensureDir $out/bin
cat >> $out/bin/${w.name} <<EOF cat >> $out/bin/${w.name} <<EOF
#! /bin/sh #! /bin/sh
export JAVA_HOME=$jre export JAVA_HOME=$jre