nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-21 11:34:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenv: runPhase returns status (#330751)

Browse Source
This commit is contained in:
Philip Taron 2024-12-02 08:03:36 -08:00 committed by GitHub
commit 6f40e94649
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkgs/stdenv/generic/setup.sh
View File

@ -1694,6 +1694,7 @@ showPhaseFooter() {
runPhase() {
local retval=0
local curPhase="$*"
if [[ "$curPhase" = unpackPhase && -n "${dontUnpack:-}" ]]; then return; fi
if [[ "$curPhase" = patchPhase && -n "${dontPatch:-}" ]]; then return; fi
@ -1712,8 +1713,9 @@ runPhase() {
startTime=$(date +"%s")
# Evaluate the variable named $curPhase if it exists, otherwise the
# function named $curPhase.
eval "${!curPhase:-$curPhase}"
# function named $curPhase. Trap errors in subshell to set non-zero retval.
trap 'retval=1; trap - ERR' ERR
eval "set -o errtrace; ${!curPhase:-$curPhase}"
endTime=$(date +"%s")
@ -1725,6 +1727,8 @@ runPhase() {
cd -- "${sourceRoot:-.}"
fi
return $retval
}