mirror of
https://github.com/simplex-chat/simplex-chat.git
synced 2026-11-05 17:07:50 +00:00
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.
This commit is contained in:
1 file changed
+9
@@ -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 ];
|
||||
})
|
||||
];
|
||||
}
|
||||
Reference in new issue
Block a user