Skip to content

Commit d91310b

Browse files
committed
remove obsolete stdenv darwinMinVersion override
we are more up-to-date now: nix-repl> stdenv.hostPlatform.darwinMinVersion "11.3"
1 parent 0b61b75 commit d91310b

File tree

2 files changed

+1
-20
lines changed

2 files changed

+1
-20
lines changed

flake.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@
170170
{
171171
otherSplices = final.generateSplicesForMkScope "nixDependencies";
172172
f = import ./packaging/dependencies.nix {
173-
inherit inputs stdenv;
173+
inherit stdenv;
174174
pkgs = final;
175175
};
176176
};

packaging/dependencies.nix

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,33 +1,14 @@
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-
1710
let
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-
3112
in
3213
scope: {
3314
inherit stdenv;

0 commit comments

Comments
 (0)