diff options
| author | Jörg Thalheim <Mic92@users.noreply.github.com> | 2021-07-23 09:45:43 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-23 09:45:43 +0100 |
| commit | 7bf8b97d6851a79ad6d4101befd30069827f70b3 (patch) | |
| tree | 35a2709387e433a0d1a096ad63aea8facb66e269 /pkgs | |
| parent | 76e175c56bbffaff5a237d6617ad006cb211ee3d (diff) | |
| parent | f3d9711f050ede32d9180c74eee18da64ae2cbf8 (diff) | |
| download | nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar.gz nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar.bz2 nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar.lz nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar.xz nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.tar.zst nixpkgs-7bf8b97d6851a79ad6d4101befd30069827f70b3.zip | |
Merge pull request #130601 from happysalada/stdenv_cosmetic
Stdenv cosmetic
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/build-support/setup-hooks/auto-patchelf.sh | 1 | ||||
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/build-support/setup-hooks/auto-patchelf.sh index 511371931de..70b1fc802b5 100644 --- a/pkgs/build-support/setup-hooks/auto-patchelf.sh +++ b/pkgs/build-support/setup-hooks/auto-patchelf.sh @@ -29,6 +29,7 @@ isExecutable() { isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" # not using grep -q, because it can cause Broken pipe + # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag [ -n "$isExeResult" ] } diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 066ef6ed9eb..2a1e0cfc6de 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -487,7 +487,7 @@ activatePackage() { # build platform are included here. That would be `depsBuild*`, # and legacy `nativeBuildInputs`, in general. If we aren't cross # compiling, however, everything can be put on the PATH. To ease - # the transition, we do include everything in thatcase. + # the transition, we do include everything in that case. # # TODO(@Ericson2314): Don't special-case native compilation if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then |