chn/nixpkgs
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixpkgs.git synced 2026-01-12 02:40:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

testers.testBuildFailure: fix

Browse Source 
Introduced by cf127c9dc3, which changed
default-builder.sh, but forgot to tell testBuildFailure about it.
This commit is contained in:
Wolfgang Walther
2025-01-21 17:36:42 +01:00
parent 1cd1cb9db8
commit 4c5458df2c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/build-support/testers/default.nix
View File

@@ -31,7 +31,7 @@
};
})
orig.realBuilder or stdenv.shell
] ++ orig.args or ["-e" (orig.builder or ../../stdenv/generic/default-builder.sh)];
] ++ orig.args or ["-e" ../../stdenv/generic/source-stdenv.sh (orig.builder or ../../stdenv/generic/default-builder.sh)];
});
# See https://nixos.org/manual/nixpkgs/unstable/#tester-testEqualDerivation

2
pkgs/build-support/testers/expect-failure.sh
View File

@@ -35,7 +35,7 @@ echo "testBuildFailure: Original builder produced exit code: $r"
# -----------------------------------------
# Write the build log to the default output
# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/default-builder.sh
# Source structured attrs as per nixpkgs/pkgs/stdenv/generic/source-stdenv.sh
#
# We need this so that we can read $outputs when `__structuredAttrs` is enabled
#