cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Revert "guile_3_0: fix build with clang 16 on x86_64-darwin"

Browse source 
This reverts commit f8382587d9.
This commit is contained in:
Randy Eckenrode 2023-10-20 18:59:09 -04:00
parent 9f8ad2a32a
commit 4b0d1daf51
No known key found for this signature in database
GPG key ID: 64C1CD4EC2A600D9
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/development/interpreters/guile/3.0.nix
View file

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

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

@ -18205,7 +18205,7 @@ with pkgs;
guile_2_2 = callPackage ../development/interpreters/guile/2.2.nix { };
guile_3_0 = darwin.apple_sdk_11_0.callPackage ../development/interpreters/guile/3.0.nix { };
guile_3_0 = callPackage ../development/interpreters/guile/3.0.nix { };
guile = guile_3_0;