From c1536f4aef6265cb3aa3be6d8cabf44e3900626d Mon Sep 17 00:00:00 2001
From: DavHau <hsngrmpf+github@gmail.com>
Date: Sat, 30 Apr 2022 16:05:28 +0200
Subject: [PATCH] call gradle2nix via flakes cli

---
 flake.lock                                      | 17 -----------------
 flake.nix                                       |  6 ------
 .../java/impure/gradle2nix/default.nix          |  5 +++--
 3 files changed, 3 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index f325f7fb..274789c0 100644
--- a/flake.lock
+++ b/flake.lock
@@ -84,22 +84,6 @@
         "type": "github"
       }
     },
-    "gradle2nix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1651167340,
-        "narHash": "sha256-U+YBGk/c2jjp6uExGiyrO8+vGpLqeRu6BlhvNDzbfJo=",
-        "owner": "kranzes",
-        "repo": "gradle2nix",
-        "rev": "5acbd615af9f26bbf11e5dd2b620c4d3cf06e01a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kranzes",
-        "repo": "gradle2nix",
-        "type": "github"
-      }
-    },
     "mach-nix": {
       "flake": false,
       "locked": {
@@ -192,7 +176,6 @@
         "crane": "crane",
         "flake-utils-pre-commit": "flake-utils-pre-commit",
         "gomod2nix": "gomod2nix",
-        "gradle2nix": "gradle2nix",
         "mach-nix": "mach-nix",
         "nixpkgs": "nixpkgs",
         "node2nix": "node2nix",
diff --git a/flake.nix b/flake.nix
index 5ca5983a..1d7c465c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -44,12 +44,6 @@
       url = "github:ipetkov/crane";
       flake = false;
     };
-
-    # required for builder/translator java/gradle2nix
-    gradle2nix = {
-      url = "github:kranzes/gradle2nix";
-      flake = false;
-    };
   };
 
   outputs = {
diff --git a/src/translators/java/impure/gradle2nix/default.nix b/src/translators/java/impure/gradle2nix/default.nix
index e65ee62d..9795427f 100644
--- a/src/translators/java/impure/gradle2nix/default.nix
+++ b/src/translators/java/impure/gradle2nix/default.nix
@@ -18,6 +18,7 @@
     utils,
     # nixpkgs dependenies
     bash,
+    coreutils,
     jq,
     writeScriptBin,
     callPackage,
@@ -28,7 +29,6 @@
       bash
       coreutils
       jq
-      (callPackage externalSources.gradle2nix {})
     ]
     ''
       # accroding to the spec, the translator reads the input from a json file
@@ -40,7 +40,8 @@
       relPath=$(${jq}/bin/jq '.project.relPath' -c -r $jsonInput)
 
       tmpDir=$(mktemp -d)
-      gradle2nix --project $source --out-dir $tmpDir
+      nix shell github:kranzes/gradle2nix/8921415b908bc847ee01009a1a5ddd40466533b7 -c \
+        gradle2nix --project $source --out-dir $tmpDir
 
       somehow format the json file created by gradle2nix $tmpDir/gradle-env.json > $outputFile