From e4d9c996fb3b7598cbc302ee3c8517a0c315b7ec Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Fri, 7 Mar 2025 14:45:29 +0100 Subject: [PATCH] nixVersions.nix_2_26: Apply nix#12557 use correct stdenv See https://github.com/NixOS/nix/pull/12557 --- .../nix/vendor/2_26/componentized.nix | 1 - .../nix/vendor/2_26/packaging/components.nix | 10 +++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix index 6436f12253fc..5ac269dda488 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/componentized.nix @@ -30,7 +30,6 @@ let officialRelease pkgs src - stdenv ; }; }; diff --git a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix index b964bd3f28e6..38af5a5c6a1d 100644 --- a/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix +++ b/pkgs/tools/package-management/nix/vendor/2_26/packaging/components.nix @@ -2,7 +2,6 @@ lib, pkgs, src, - stdenv, officialRelease, }: @@ -12,6 +11,15 @@ let inherit (scope) callPackage ; + inherit + (scope.callPackage ( + { stdenv }: + { + inherit stdenv; + } + ) { }) + stdenv + ; inherit (pkgs.buildPackages) meson ninja