From d2d149334a9874cb7db679a9ab88f9e206a696a5 Mon Sep 17 00:00:00 2001 From: Jared Baur Date: Sun, 31 May 2026 09:15:38 -0700 Subject: [PATCH] requireFile: use stdenvNoCC When not using stdenvNoCC with a package-set setup for cross-compilation, the host platform's target triplet is added as a suffix to the derivation name, invalidating the requireFile FOD. Using stdenvNoCC prevents that due to some logic in `make-derivation.nix`, which more closely matches the behavior before switching to `extendMkDerivation`. --- pkgs/build-support/trivial-builders/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/trivial-builders/default.nix b/pkgs/build-support/trivial-builders/default.nix index 379ca706fdc3..6db04772acf0 100644 --- a/pkgs/build-support/trivial-builders/default.nix +++ b/pkgs/build-support/trivial-builders/default.nix @@ -892,7 +892,7 @@ rec { # Docs in doc/build-helpers/fetchers.chapter.md # See https://nixos.org/manual/nixpkgs/unstable/#requirefile requireFile = lib.extendMkDerivation { - constructDrv = stdenv.mkDerivation; + constructDrv = stdenvNoCC.mkDerivation; excludeDrvArgNames = [ "hash"