diff options
author | Artturin <Artturin@artturin.com> | 2023-01-15 23:45:50 +0200 |
---|---|---|
committer | Artturin <Artturin@artturin.com> | 2023-01-15 23:56:23 +0200 |
commit | 856f3a46b2f64d4481ced392e1ebc86f09551521 (patch) | |
tree | 01dafc31a61630c98882c432c23854a34cacc6a2 /pkgs/stdenv | |
parent | 4e880e72409b49fc0d160cb206811dce04661db4 (diff) | |
download | nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar.gz nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar.bz2 nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar.lz nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar.xz nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.tar.zst nixpkgs-856f3a46b2f64d4481ced392e1ebc86f09551521.zip |
stdenv: drop remove unnecessary env var
and the associated obsolete functions support for log nesting was removed in 2017 https://github.com/nixos/nixpkgs/commit/6669a3b47711dc967df0ea8ff93fa9857aad015d
Diffstat (limited to 'pkgs/stdenv')
-rw-r--r-- | pkgs/stdenv/generic/setup.sh | 31 |
1 files changed, 11 insertions, 20 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 5fba54dbcce..be68c76d638 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -125,11 +125,6 @@ _eval() { ###################################################################### # Logging. -# Obsolete. -stopNest() { true; } -header() { echo "$1"; } -closeNest() { true; } - # Prints a command such that all word splits are unambiguous. We need # to split the command in three parts because the middle format string # will be, and must be, repeated for each argument. The first argument @@ -798,10 +793,6 @@ unset _HOST_PATH unset _XDG_DATA_DIRS -# Make GNU Make produce nested output. -export NIX_INDENT_MAKE=1 - - # Normalize the NIX_BUILD_CORES variable. The value might be 0, which # means that we're supposed to try and auto-detect the number of # available CPU cores at run-time. @@ -1033,7 +1024,7 @@ _defaultUnpack() { unpackFile() { curSrc="$1" - header "unpacking source archive $curSrc" 3 + echo "unpacking source archive $curSrc" if ! runOneHook unpackCmd "$curSrc"; then echo "do not know how to unpack source archive $curSrc" exit 1 @@ -1130,7 +1121,7 @@ patchPhase() { fi for i in "${patchesArray[@]}"; do - header "applying patch $i" 3 + echo "applying patch $i" local uncompress=cat case "$i" in *.gz) @@ -1494,15 +1485,15 @@ distPhase() { showPhaseHeader() { local phase="$1" case "$phase" in - unpackPhase) header "unpacking sources";; - patchPhase) header "patching sources";; - configurePhase) header "configuring";; - buildPhase) header "building";; - checkPhase) header "running tests";; - installPhase) header "installing";; - fixupPhase) header "post-installation fixup";; - installCheckPhase) header "running install tests";; - *) header "$phase";; + unpackPhase) echo "unpacking sources";; + patchPhase) echo "patching sources";; + configurePhase) echo "configuring";; + buildPhase) echo "building";; + checkPhase) echo "running tests";; + installPhase) echo "installing";; + fixupPhase) echo "post-installation fixup";; + installCheckPhase) echo "running install tests";; + *) echo "$phase";; esac } |