From dff8e5bc4cff0257d2edb54b074f6cbc858307be Mon Sep 17 00:00:00 2001
From: Tad Fisher <tadfisher@gmail.com>
Date: Fri, 13 Dec 2024 12:01:24 -0800
Subject: [PATCH] Unwrap gradle package

---
 nix/build-gradle-package.nix | 3 +--
 nix/gradle-setup-hook.nix    | 9 +++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nix/build-gradle-package.nix b/nix/build-gradle-package.nix
index b963c45..5ff88f6 100644
--- a/nix/build-gradle-package.nix
+++ b/nix/build-gradle-package.nix
@@ -3,13 +3,12 @@
   stdenv,
   buildMavenRepo,
   gradleSetupHook,
-  writeText,
 }:
 
 {
   # Path to the lockfile generated by gradle2nix (e.g. gradle.lock).
   lockFile ? null,
-  # The Gradle package to use. Default is 'pkgs.gradle'.
+  # The Gradle package to use. Default is 'pkgs.gradle-unwrapped'.
   gradle ? null,
   # Override the default JDK used to run Gradle itself.
   buildJdk ? null,
diff --git a/nix/gradle-setup-hook.nix b/nix/gradle-setup-hook.nix
index 948d72b..7dc6a2a 100644
--- a/nix/gradle-setup-hook.nix
+++ b/nix/gradle-setup-hook.nix
@@ -1,7 +1,12 @@
 { makeSetupHook, gradle }:
 
+let
+  gradle-unwrapped =
+    if gradle ? passthru && gradle.passthru ? unwrapped then gradle.passthru.unwrapped else gradle;
+
+in
 makeSetupHook {
   name = "gradle-setup-hook";
-  propagatedBuildInputs = [ gradle ];
-  passthru.gradle = gradle;
+  propagatedBuildInputs = [ gradle-unwrapped ];
+  passthru.gradle = gradle-unwrapped;
 } ./setup-hook.sh