wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-07-08 06:53:54 +02:00
Code Activity

Merge pull request #12560 from NixOS/mergify/bp/2.26-maintenance/pr-12557

Browse source 
packaging: Use correct stdenv for x86_64-darwin (backport #12557)
This commit is contained in:
Eelco Dolstra 2025-02-24 22:04:52 +01:00 • committed by GitHub
commit 6d9724a2b3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
flake.nix
View file

@ -165,7 +165,6 @@
f = import ./packaging/components.nix { f = import ./packaging/components.nix {
inherit (final) lib; inherit (final) lib;
inherit officialRelease; inherit officialRelease;
inherit stdenv;
pkgs = final; pkgs = final;
src = self; src = self;
}; };

10
packaging/components.nix
View file

@ -2,7 +2,6 @@
lib, lib,
pkgs, pkgs,
src, src,
stdenv,
officialRelease, officialRelease,
}: }:
@ -12,6 +11,15 @@ let
inherit (scope) inherit (scope)
callPackage callPackage
; ;
inherit
(scope.callPackage (
{ stdenv }:
{
inherit stdenv;
}
) { })
stdenv
;
inherit (pkgs.buildPackages) inherit (pkgs.buildPackages)
meson meson
ninja ninja