groovy: 2.4.3 -> 2.4.5 and wrap correctly

+14 -6
+14 -6
pkgs/development/interpreters/groovy/default.nix
··· 1 - { stdenv, fetchurl, unzip }: 2 3 # at runtime, need jdk 4 5 stdenv.mkDerivation rec { 6 name = "groovy-${version}"; 7 - version = "2.4.3"; 8 9 src = fetchurl { 10 - url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; 11 - sha256 = "1qfvw49fbw9svk4gsniw0g0ghal0dqm2hf1i77qmcf80lln1vhdh"; 12 }; 13 14 installPhase = '' 15 mkdir -p $out 16 rm bin/*.bat 17 mv * $out 18 ''; 19 20 phases = "unpackPhase installPhase"; 21 - 22 - buildInputs = [ unzip ]; 23 24 meta = with stdenv.lib; { 25 description = "An agile dynamic language for the Java Platform";
··· 1 + { stdenv, fetchurl, unzip, which, makeWrapper, jdk }: 2 3 # at runtime, need jdk 4 5 stdenv.mkDerivation rec { 6 name = "groovy-${version}"; 7 + version = "2.4.5"; 8 9 src = fetchurl { 10 + url = "http://dl.bintray.com/groovy/maven/apache-groovy-binary-${version}.zip"; 11 + sha256 = "1ajcrma18z0zr7h69bg4v2brxnxa4ljc9a55pk4q92vi3ypyks47"; 12 }; 13 + 14 + buildInputs = [ unzip makeWrapper ]; 15 16 installPhase = '' 17 mkdir -p $out 18 rm bin/*.bat 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 28 ''; 29 30 phases = "unpackPhase installPhase"; 31 32 meta = with stdenv.lib; { 33 description = "An agile dynamic language for the Java Platform";