guile: workaround for libunistring / darwin libiconv (#364503)

NixOS · Dec 13, 2024 · 6d0b733 · 6d0b733
2 parents 49472e2 + 76cca7e
commit 6d0b733
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/pkgs/development/interpreters/guile/2.0.nix b/pkgs/development/interpreters/guile/2.0.nix
@@ -11,15 +11,22 @@
   libffi,
   libtool,
   libunistring,
+  libiconvReal,
   makeWrapper,
   pkg-config,
   pkgsBuildBuild,
   readline,
-}:
+}@args:
 
 let
   # Do either a coverage analysis build or a standard build.
   builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+  # workaround for libiconv bug in macOS 14/15
+  libunistring =
+    if stdenv.hostPlatform.isDarwin then
+      args.libunistring.override { libiconv = libiconvReal; }
+    else
+      args.libunistring;
 in
 builder rec {
   pname = "guile";

diff --git a/pkgs/development/interpreters/guile/2.2.nix b/pkgs/development/interpreters/guile/2.2.nix
@@ -11,15 +11,22 @@
   libffi,
   libtool,
   libunistring,
+  libiconvReal,
   makeWrapper,
   pkg-config,
   pkgsBuildBuild,
   readline,
-}:
+}@args:
 
 let
   # Do either a coverage analysis build or a standard build.
   builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+  # workaround for libiconv bug in macOS 14/15
+  libunistring =
+    if stdenv.hostPlatform.isDarwin then
+      args.libunistring.override { libiconv = libiconvReal; }
+    else
+      args.libunistring;
 in
 builder rec {
   pname = "guile";

diff --git a/pkgs/development/interpreters/guile/3.0.nix b/pkgs/development/interpreters/guile/3.0.nix
@@ -11,17 +11,24 @@
   libffi,
   libtool,
   libunistring,
+  libiconvReal,
   libxcrypt,
   makeWrapper,
   pkg-config,
   pkgsBuildBuild,
   readline,
   writeScript,
-}:
+}@args:
 
 let
   # Do either a coverage analysis build or a standard build.
   builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation;
+  # workaround for libiconv bug in macOS 14/15
+  libunistring =
+    if stdenv.hostPlatform.isDarwin then
+      args.libunistring.override { libiconv = libiconvReal; }
+    else
+      args.libunistring;
 in
 builder rec {
   pname = "guile";