mirror of
https://github.com/NixOS/nix
synced 2025-06-25 06:31:14 +02:00
Revert "Merge pull request #11804 from obsidiansystems/remove-old-make"
This reverts commit619eeb658a
, reversing changes made to1af94bf471
.
This commit is contained in:
parent
3ab8534b13
commit
67d231c046
134 changed files with 4722 additions and 75 deletions
|
@ -343,6 +343,15 @@ count() {
|
|||
echo $#
|
||||
}
|
||||
|
||||
# Sometimes, e.g. due to pure eval, restricted eval, or sandboxing, we
|
||||
# cannot look up `config.nix` in the build dir, and have to instead get
|
||||
# it from the current directory. (In this case, the current directly
|
||||
# will be somewhere in `$TEST_ROOT`.)
|
||||
removeBuildDirRef() {
|
||||
# shellcheck disable=SC2016 # The ${} in this is Nix, not shell
|
||||
sed -i -e 's,"${builtins.getEnv "_NIX_TEST_BUILD_DIR"}/[^ ]*config.nix",./config.nix,' "$@"
|
||||
}
|
||||
|
||||
trap onError ERR
|
||||
|
||||
fi # COMMON_FUNCTIONS_SH_SOURCED
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue