From fc966aead08750c8f8ce05db072e6b7c78f63528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Fri, 27 Feb 2015 11:04:04 +0100 Subject: [PATCH] gradle: don't hardcode gradle-launcher-VERSION.jar Instead, figure out VERSION at build-time. This simplifies using overrideDerivation (no need to copy and modify installPhase). Also add a check that the file exists (catch potential failure early). --- pkgs/development/tools/build-managers/gradle/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 3bbfff9221ba..3bff9d59e7fa 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -12,9 +12,11 @@ stdenv.mkDerivation rec { mkdir -pv $out cp -rv lib $out + gradle_launcher_jar=$(echo $out/lib/gradle-launcher-*.jar) + test -f $gradle_launcher_jar makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $gradle_launcher_jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase";