groovy: 2.4.3 -> 2.4.5 and wrap correctly

+14 -6
+14 -6
pkgs/development/interpreters/groovy/default.nix
··· 1 - { stdenv, fetchurl, unzip }: 1 + { stdenv, fetchurl, unzip, which, makeWrapper, jdk }: 2 2 3 3 # at runtime, need jdk 4 4 5 5 stdenv.mkDerivation rec { 6 6 name = "groovy-${version}"; 7 - version = "2.4.3"; 7 + version = "2.4.5"; 8 8 9 9 src = fetchurl { 10 - url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; 11 - sha256 = "1qfvw49fbw9svk4gsniw0g0ghal0dqm2hf1i77qmcf80lln1vhdh"; 10 + url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; 11 + sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47"; 12 12 }; 13 + 14 + buildInputs = [ unzip makeWrapper ]; 13 15 14 16 installPhase = '' 15 17 mkdir -p $out 16 18 rm bin/*.bat 17 19 mv * $out 20 + 21 + sed -i 's#which#${which}/bin/which#g' $out/bin/startGroovy 22 + 23 + for p in grape java2groovy groovy{,doc,c,sh,Console}; do 24 + wrapProgram $out/bin/$p \ 25 + --set JAVA_HOME "${jdk}" \ 26 + --prefix PATH ":" "${jdk}/bin" 27 + done 18 28 ''; 19 29 20 30 phases = "unpackPhase installPhase"; 21 - 22 - buildInputs = [ unzip ]; 23 31 24 32 meta = with stdenv.lib; { 25 33 description = "An agile dynamic language for the Java Platform";