File tree 2 files changed +20
-1
lines changed
2 files changed +20
-1
lines changed Original file line number Diff line number Diff line change 171
171
{
172
172
otherSplices = final . generateSplicesForMkScope "nixDependencies" ;
173
173
f = import ./packaging/dependencies.nix {
174
- inherit stdenv ;
174
+ inherit inputs stdenv ;
175
175
pkgs = final ;
176
176
} ;
177
177
} ;
Original file line number Diff line number Diff line change 1
1
# These overrides are applied to the dependencies of the Nix components.
2
2
3
3
{
4
+ # Flake inputs; used for sources
5
+ inputs ,
6
+
4
7
# The raw Nixpkgs, not affected by this scope
5
8
pkgs ,
6
9
7
10
stdenv ,
8
11
} :
9
12
13
+ let
14
+ prevStdenv = stdenv ;
15
+ in
16
+
10
17
let
11
18
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
+
12
31
in
13
32
scope : {
14
33
inherit stdenv ;
You can’t perform that action at this time.
0 commit comments