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`.
This commit is contained in:
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user