libunistring: use gnu libiconv on darwin

NixOS · Dec 12, 2024 · 3b2095d · 3b2095d
1 parent 52a2613
commit 3b2095d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
@@ -3,9 +3,17 @@
   lib,
   stdenv,
   libiconv,
+  libiconvReal,
   updateAutotoolsGnuConfigScriptsHook,
   darwin,
-}:
+}@args:
+
+let
+  # https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html
+  # macoOS libiconv 14 & 15 do not work with libunistring and a configure test
+  # added in 1.3 rejects even building with it so use gnu libiconv on darwin
+  libiconv = if stdenv.hostPlatform.isDarwin then libiconvReal else args.libiconv;
+in
 
 # Note: this package is used for bootstrapping fetchurl, and thus
 # cannot use fetchpatch! All mutable patches (generated by GitHub or
@@ -30,9 +38,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   strictDeps = true;
   propagatedBuildInputs = lib.optional (!stdenv.hostPlatform.isLinux) libiconv;
-  buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
-    darwin.apple_sdk.frameworks.CoreServices
-  ];
   nativeBuildInputs = [ updateAutotoolsGnuConfigScriptsHook ];
 
   configureFlags = [ "--with-libiconv-prefix=${libiconv}" ];

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
@@ -1213,7 +1213,6 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               ld64.out
               libffi.out
               libtapi.out
-              libunistring.out
               libxml2.out
               ncurses.dev
               ncurses.man