From c44faa20a356c45bad7769b76f7111dd5dbeeb06 Mon Sep 17 00:00:00 2001
From: quapka
Date: Fri, 26 Jul 2024 10:46:19 +0200
Subject: Clean up Nix Gradle build

---
 flake.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/flake.nix b/flake.nix
index efcdac1..59e9da3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -141,11 +141,10 @@
             gradle2nix.builders.${system}.buildGradlePackage rec {
               pname = "ECTesterStandalone";
               version = "0.3.3";
-              # gradleInstallFlags = [ "installDist" ];
-              # gradleBuildFlags = [ "standalone:uberJar" ]; # ":standalone:compileJava" ":standalone:uberJar" ]; "--no-build-cache"
               lockFile = ./gradle.lock;
-              # FIXME all libs need to be built, but combining Gradle build all-libs and dedicated shim derivations won't work 
-              gradleBuildFlags = [ "libs" "-PlibName=tomcrypt" ":standalone:uberJar"]; # ":standalone:compileJava" ":standalone:uberJar" ]; "--no-build-cache"
+
+              # NOTE: the shims are built separately, therefore no need to call libs
+              gradleBuildFlags = [ ":standalone:uberJar"];
               src = ./.;
 
               jniLibsPath = "standalone/src/main/resources/cz/crcs/ectester/standalone/libs/jni/";
-- 
cgit v1.3.1