From 77f2cc5791904caf4077c526fbdaca4ad27e2374 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 6 Mar 2025 03:00:58 -0500
Subject: apply build system patches

This is a more upstreamable approach, and doesn't require any kind of
weird substitution on our end. It also avoids downloading Kotlin in our
antDeps and fixes cross compilation!! (only tested on aarch64)

Signed-off-by: Seth Flynn <getchoo@tuta.io>
---
 pkgs/fetch-ant-deps.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'pkgs/fetch-ant-deps.nix')

diff --git a/pkgs/fetch-ant-deps.nix b/pkgs/fetch-ant-deps.nix
index 69e29b4..a63f76e 100644
--- a/pkgs/fetch-ant-deps.nix
+++ b/pkgs/fetch-ant-deps.nix
@@ -32,7 +32,8 @@ lib.makeOverridable (
 
         buildPhase = ''
           runHook preBuild
-          ant init
+          concatTo flagsArray buildFlags buildFlagsArray antFlags antFlagsArray
+          ant init "''${flagsArray[@]}"
           runHook postBuild
         '';
 
-- 
cgit v1.2.3