File tree Expand file tree Collapse file tree 2 files changed +0
-21
lines changed Expand file tree Collapse file tree 2 files changed +0
-21
lines changed Original file line number Diff line number Diff line change 1010 stdenv ,
1111} :
1212
13- let
14- prevStdenv = stdenv ;
15- in
16-
1713let
1814 inherit ( pkgs ) lib ;
19-
20- stdenv = if prevStdenv . isDarwin && prevStdenv . isx86_64 then darwinStdenv else prevStdenv ;
21-
22- # Fix the following error with the default x86_64-darwin SDK:
23- #
24- # error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
25- #
26- # Despite the use of the 10.13 deployment target here, the aligned
27- # allocation function Clang uses with this setting actually works
28- # all the way back to 10.6.
29- # NOTE: this is not just a version constraint, but a request to make Darwin
30- # provide this version level of support. Removing this minimum version
31- # request will regress the above error.
32- darwinStdenv = pkgs . overrideSDK prevStdenv { darwinMinVersion = "10.13" ; } ;
33-
3415in
3516scope : {
3617 inherit stdenv ;
Original file line number Diff line number Diff line change @@ -64,8 +64,6 @@ mkMesonLibrary (finalAttrs: {
6464 sqlite
6565 ]
6666 ++ lib . optional stdenv . hostPlatform . isLinux libseccomp
67- # There have been issues building these dependencies
68- ++ lib . optional stdenv . hostPlatform . isDarwin darwin . apple_sdk . libs . sandbox
6967 ++ lib . optional withAWS aws-sdk-cpp ;
7068
7169 propagatedBuildInputs = [
You can’t perform that action at this time.
0 commit comments