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

Merge #252438: guile: fix build with clang 16 on x86_64-darwin

Browse Source 
...into staging
This commit is contained in:
Vladimír Čunát
2023-09-28 09:02:50 +02:00
parent b53e748df3 f8382587d9
commit 2b7f43b550
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/development/interpreters/guile/2.2.nix
+3 -3
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 = [
pkgs/development/interpreters/guile/3.0.nix
+4 -3
View File
@@ -35,9 +35,10 @@ builder rec {
outputs = [ "out" "dev" "info" ];
setOutputFlags = false; # $dev gets into the library otherwise
depsBuildBuild = [
buildPackages.stdenv.cc
] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform)
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_3_0;
nativeBuildInputs = [
makeWrapper
pkgs/top-level/all-packages.nix
+2 -2
View File
@@ -18371,9 +18371,9 @@ 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 { };
guile_3_0 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/3.0.nix { };
guile = guile_3_0;