Unwrap gradle package

This commit is contained in:
Tad Fisher
2024-12-13 12:01:24 -08:00
committed by Tad Fisher
parent b33693bc6b
commit dff8e5bc4c
2 changed files with 8 additions and 4 deletions

View File

@@ -3,13 +3,12 @@
stdenv, stdenv,
buildMavenRepo, buildMavenRepo,
gradleSetupHook, gradleSetupHook,
writeText,
}: }:
{ {
# Path to the lockfile generated by gradle2nix (e.g. gradle.lock). # Path to the lockfile generated by gradle2nix (e.g. gradle.lock).
lockFile ? null, lockFile ? null,
# The Gradle package to use. Default is 'pkgs.gradle'. # The Gradle package to use. Default is 'pkgs.gradle-unwrapped'.
gradle ? null, gradle ? null,
# Override the default JDK used to run Gradle itself. # Override the default JDK used to run Gradle itself.
buildJdk ? null, buildJdk ? null,

View File

@@ -1,7 +1,12 @@
{ makeSetupHook, gradle }: { makeSetupHook, gradle }:
let
gradle-unwrapped =
if gradle ? passthru && gradle.passthru ? unwrapped then gradle.passthru.unwrapped else gradle;
in
makeSetupHook { makeSetupHook {
name = "gradle-setup-hook"; name = "gradle-setup-hook";
propagatedBuildInputs = [ gradle ]; propagatedBuildInputs = [ gradle-unwrapped ];
passthru.gradle = gradle; passthru.gradle = gradle-unwrapped;
} ./setup-hook.sh } ./setup-hook.sh