colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

guile_2_2: fix build with clang 16 on x86_64-darwin

Browse Source 
Guile 2.2 calls `__sincos`, which should be defined in `math.h`, but the
version of that header in the 10.12 SDK is very old (predating 10.12).
Until there is a version of that header available, use the 11.0 SDK to
build Guile.
This commit is contained in:
Randy Eckenrode 2023-07-18 20:39:00 -06:00
parent dba6d77ad2
commit 98bd3171dc
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/interpreters/guile/2.2.nix
View File

@ -34,9 +34,9 @@ builder rec {
outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [
buildPackages.stdenv.cc
]
depsBuildBuild = if stdenv.buildPlatform.isDarwin
then [ buildPackages.darwin.apple_sdk_11_0.stdenv.cc ]
else [ buildPackages.stdenv.cc ]
++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
pkgsBuildBuild.guile_2_2;
nativeBuildInputs = [

2
pkgs/top-level/all-packages.nix
View File

@ -18297,7 +18297,7 @@ with pkgs;
# Needed for autogen
guile_2_0 = callPackage ../development/interpreters/guile/2.0.nix { };
guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { };
guile_2_2 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/2.2.nix { };
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };