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

+24 -3
+8 -1
pkgs/development/interpreters/guile/2.0.nix
··· 11 libffi, 12 libtool, 13 libunistring, 14 makeWrapper, 15 pkg-config, 16 pkgsBuildBuild, 17 readline, 18 - }: 19 20 let 21 # Do either a coverage analysis build or a standard build. 22 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 23 in 24 builder rec { 25 pname = "guile";
··· 11 libffi, 12 libtool, 13 libunistring, 14 + libiconvReal, 15 makeWrapper, 16 pkg-config, 17 pkgsBuildBuild, 18 readline, 19 + }@args: 20 21 let 22 # Do either a coverage analysis build or a standard build. 23 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 24 + # workaround for libiconv bug in macOS 14/15 25 + libunistring = 26 + if stdenv.hostPlatform.isDarwin then 27 + args.libunistring.override { libiconv = libiconvReal; } 28 + else 29 + args.libunistring; 30 in 31 builder rec { 32 pname = "guile";
+8 -1
pkgs/development/interpreters/guile/2.2.nix
··· 11 libffi, 12 libtool, 13 libunistring, 14 makeWrapper, 15 pkg-config, 16 pkgsBuildBuild, 17 readline, 18 - }: 19 20 let 21 # Do either a coverage analysis build or a standard build. 22 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 23 in 24 builder rec { 25 pname = "guile";
··· 11 libffi, 12 libtool, 13 libunistring, 14 + libiconvReal, 15 makeWrapper, 16 pkg-config, 17 pkgsBuildBuild, 18 readline, 19 + }@args: 20 21 let 22 # Do either a coverage analysis build or a standard build. 23 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 24 + # workaround for libiconv bug in macOS 14/15 25 + libunistring = 26 + if stdenv.hostPlatform.isDarwin then 27 + args.libunistring.override { libiconv = libiconvReal; } 28 + else 29 + args.libunistring; 30 in 31 builder rec { 32 pname = "guile";
+8 -1
pkgs/development/interpreters/guile/3.0.nix
··· 11 libffi, 12 libtool, 13 libunistring, 14 libxcrypt, 15 makeWrapper, 16 pkg-config, 17 pkgsBuildBuild, 18 readline, 19 writeScript, 20 - }: 21 22 let 23 # Do either a coverage analysis build or a standard build. 24 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 25 in 26 builder rec { 27 pname = "guile";
··· 11 libffi, 12 libtool, 13 libunistring, 14 + libiconvReal, 15 libxcrypt, 16 makeWrapper, 17 pkg-config, 18 pkgsBuildBuild, 19 readline, 20 writeScript, 21 + }@args: 22 23 let 24 # Do either a coverage analysis build or a standard build. 25 builder = if coverageAnalysis != null then coverageAnalysis else stdenv.mkDerivation; 26 + # workaround for libiconv bug in macOS 14/15 27 + libunistring = 28 + if stdenv.hostPlatform.isDarwin then 29 + args.libunistring.override { libiconv = libiconvReal; } 30 + else 31 + args.libunistring; 32 in 33 builder rec { 34 pname = "guile";