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

This commit is contained in:
Vladimír Čunát
2024-12-13 09:48:10 +01:00
3 changed files with 24 additions and 3 deletions
+8 -1
View File
@@ -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";
+8 -1
View File
@@ -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";
+8 -1
View File
@@ -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";