Skip to content

Commit

Permalink
guile: workaround for libunistring / darwin libiconv
Browse files Browse the repository at this point in the history
guile will fail in the configure phase on darwin due to libunistring not
building with libiconv as libunistring 1.3 rejects darwin's libiconv
implementation. Work around this by using the gnu libiconv.

https://lists.gnu.org/archive/html/bug-gnulib/2024-05/msg00375.html
  • Loading branch information
paparodeo committed Dec 12, 2024
1 parent 52a2613 commit 76cca7e
Show file tree
Hide file tree
Showing 3 changed files with 24 additions and 3 deletions.
9 changes: 8 additions & 1 deletion pkgs/development/interpreters/guile/2.0.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 8 additions & 1 deletion pkgs/development/interpreters/guile/2.2.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
9 changes: 8 additions & 1 deletion pkgs/development/interpreters/guile/3.0.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down

0 comments on commit 76cca7e

Please sign in to comment.