wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 06:31:14 +02:00
Code Activity

remove obsolete stdenv darwinMinVersion override

Browse source 
we are more up-to-date now:

nix-repl> stdenv.hostPlatform.darwinMinVersion
"11.3"
This commit is contained in:
Jörg Thalheim 2025-04-01 19:17:05 +02:00
parent 0b61b758fb
commit d91310bb32
2 changed files with 1 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
flake.nix
View file

@ -170,7 +170,7 @@
{ {
otherSplices = final.generateSplicesForMkScope "nixDependencies"; otherSplices = final.generateSplicesForMkScope "nixDependencies";
f = import ./packaging/dependencies.nix { f = import ./packaging/dependencies.nix {
inherit inputs stdenv; inherit stdenv;
pkgs = final; pkgs = final;
}; };
}; };

19
packaging/dependencies.nix
View file

@ -1,33 +1,14 @@
# These overrides are applied to the dependencies of the Nix components. # These overrides are applied to the dependencies of the Nix components.
{ {
# Flake inputs; used for sources
inputs,
# The raw Nixpkgs, not affected by this scope # The raw Nixpkgs, not affected by this scope
pkgs, pkgs,
stdenv, stdenv,
}: }:
let
prevStdenv = stdenv;
in
let let
inherit (pkgs) lib; inherit (pkgs) lib;
stdenv = if prevStdenv.isDarwin && prevStdenv.isx86_64 then darwinStdenv else prevStdenv;
# Fix the following error with the default x86_64-darwin SDK:
#
# error: aligned allocation function of type 'void *(std::size_t, std::align_val_t)' is only available on macOS 10.13 or newer
#
# Despite the use of the 10.13 deployment target here, the aligned
# allocation function Clang uses with this setting actually works
# all the way back to 10.6.
darwinStdenv = pkgs.overrideSDK prevStdenv { darwinMinVersion = "10.13"; };
in in
scope: { scope: {
inherit stdenv; inherit stdenv;