From 52cbb2c7f796bfeca0824bd3e2168e344ce84774 Mon Sep 17 00:00:00 2001
From: Moritz Angermann <moritz@zw3rk.com>
Date: Fri, 16 Oct 2026 00:05:08 +0900
Subject: [PATCH] Propagate Android iconv to interpreter consumers

Declare GNU libiconv as a ghc-internal system dependency in Android projects. The setup hook satisfies configure before it records library names, so consumer slices must also receive the system dependency and its static link flag.

Checked exact production vanilla and profiled interpreter derivations: both now include GNU libiconv in runtimeLibs, and native/cross compiler identities remain unchanged. The core derivation changes through dependency and install metadata; its code generation inputs remain the same.
---
 scripts/nix/android-iconv-project.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/scripts/nix/android-iconv-project.nix b/scripts/nix/android-iconv-project.nix
index 13e388e81c..d87b9c57ed 100644
--- a/scripts/nix/android-iconv-project.nix
+++ b/scripts/nix/android-iconv-project.nix
@@ -9,4 +9,13 @@ lib.mkIf (pkgs.stdenv.hostPlatform.isAndroid && config.compiler-nix-name == "ghc
       extra-lib-dirs: ${lib.getLib pkgs.libiconv}/lib
       configure-options: --with-iconv-includes=${lib.getDev pkgs.libiconv}/include --with-iconv-libraries=${lib.getLib pkgs.libiconv}/lib
   '';
+
+  # The libiconv setup hook supplies -liconv during configure. Declare the
+  # system dependency too, so v2 consumer slices retain that link flag.
+  modules = [
+    ({ lib, pkgs, ... }:
+      lib.mkIf pkgs.stdenv.hostPlatform.isAndroid {
+        packages.ghc-internal.components.library.libs = lib.mkAfter [ pkgs.libiconv ];
+      })
+  ];
 }