c4patino/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-07-06 17:13:24 -05:00
Code Issues Projects Releases Packages Wiki Activity

[Backport release-26.05] requireFile: use stdenvNoCC (#531184)

Browse source
This commit is contained in:
Jared Baur 2026-06-15 15:57:08 +00:00 • committed by GitHub
commit 88850e9d7d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkgs/build-support/trivial-builders/default.nix
View file

@ -887,7 +887,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"

1
pkgs/build-support/trivial-builders/test/default.nix
View file

@ -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;

22
pkgs/build-support/trivial-builders/test/requireFile.nix Normal file
View file

@ -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