nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 06:53:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

stdenv: Fix possible issues discovered with

Browse Source 
```
set -o errexit -o nounset -o pipefail
shopt -s inherit_errexit
```

in `stdenv/default-builder.sh`
This commit is contained in:
Artturin 2023-07-28 17:30:50 +03:00
parent 9816ca55c2
commit 1db1e3c467
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/build-support/setup-hooks/multiple-outputs.sh
View File

@ -69,8 +69,8 @@ _multioutConfig() {
# try to detect share/doc/${shareDocName} # try to detect share/doc/${shareDocName}
# Note: sadly, $configureScript detection comes later in configurePhase, # Note: sadly, $configureScript detection comes later in configurePhase,
# and reordering would cause more trouble than worth. # and reordering would cause more trouble than worth.
if [ -z "$shareDocName" ]; then if [ -z "${shareDocName:-}" ]; then
local confScript="$configureScript" local confScript="${configureScript:-}"
if [ -z "$confScript" ] && [ -x ./configure ]; then if [ -z "$confScript" ] && [ -x ./configure ]; then
confScript=./configure confScript=./configure
fi fi

2
pkgs/build-support/setup-hooks/patch-shebangs.sh
View File

@ -53,7 +53,7 @@ patchShebangs() {
read -r oldInterpreterLine < "$f" read -r oldInterpreterLine < "$f"
read -r oldPath arg0 args <<< "${oldInterpreterLine:2}" read -r oldPath arg0 args <<< "${oldInterpreterLine:2}"
if [[ -z "$pathName" ]]; then if [[ -z "${pathName:-}" ]]; then
if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then if [[ -n $strictDeps && $f == "$NIX_STORE"* ]]; then
pathName=HOST_PATH pathName=HOST_PATH
else else

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

@ -1216,7 +1216,7 @@ fixLibtool() {
done done
sed -i "$1" \ sed -i "$1" \
-e "s^eval \(sys_lib_search_path=\).*^\1'$search_path'^" \ -e "s^eval \(sys_lib_search_path=\).*^\1'${search_path:-}'^" \
-e 's^eval sys_lib_.+search_path=.*^^' -e 's^eval sys_lib_.+search_path=.*^^'
} }