File tree Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Expand file tree Collapse file tree 2 files changed +1
-20
lines changed Original file line number Diff line number Diff line change 170170 {
171171 otherSplices = final . generateSplicesForMkScope "nixDependencies" ;
172172 f = import ./packaging/dependencies.nix {
173- inherit inputs stdenv ;
173+ inherit stdenv ;
174174 pkgs = final ;
175175 } ;
176176 } ;
Original file line number Diff line number Diff line change 11# These overrides are applied to the dependencies of the Nix components.
22
33{
4- # Flake inputs; used for sources
5- inputs ,
6-
74 # The raw Nixpkgs, not affected by this scope
85 pkgs ,
96
107 stdenv ,
118} :
129
13- let
14- prevStdenv = stdenv ;
15- in
16-
1710let
1811 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- darwinStdenv = pkgs . overrideSDK prevStdenv { darwinMinVersion = "10.13" ; } ;
30-
3112in
3213scope : {
3314 inherit stdenv ;
You can’t perform that action at this time.
0 commit comments