requireFile: use stdenvNoCC (#526409)
This commit is contained in:
@@ -893,7 +893,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"
|
||||
|
||||
@@ -25,6 +25,7 @@ recurseIntoAttrs {
|
||||
symlinkJoin = recurseIntoAttrs (callPackage ./symlink-join.nix { });
|
||||
overriding = callPackage ../test-overriding.nix { };
|
||||
inherit references;
|
||||
requireFile = callPackage ./requireFile.nix { };
|
||||
writeCBin = callPackage ./writeCBin.nix { };
|
||||
writeClosure-union = callPackage ./writeClosure-union.nix {
|
||||
inherit (references) samples;
|
||||
|
||||
@@ -0,0 +1,22 @@
|
||||
{
|
||||
pkgsStatic,
|
||||
lib,
|
||||
requireFile,
|
||||
emptyFile,
|
||||
}:
|
||||
let
|
||||
name = "this-is-a-test";
|
||||
requireFileTest =
|
||||
requireFile:
|
||||
requireFile {
|
||||
inherit name;
|
||||
url = "this-is-a-test";
|
||||
hash = lib.fakeHash;
|
||||
};
|
||||
requireFile-native = requireFileTest requireFile;
|
||||
requireFile-static = requireFileTest pkgsStatic.requireFile;
|
||||
in
|
||||
assert lib.assertMsg (
|
||||
requireFile-native.name == name && requireFile-static.name == name
|
||||
) "requireFile derivation name must be the same across different package sets";
|
||||
emptyFile
|
||||
Reference in New Issue
Block a user