commit 7bf8b97d6851a79ad6d4101befd30069827f70b3

pyrox.dev / nixpkgs

lol

fork atom

Merge pull request #130601 from happysalada/stdenv_cosmetic

Stdenv cosmetic

authored by

Jörg Thalheim and committed by

GitHub 4 years ago 7bf8b97d 76e175c5

+2 -1

2 changed files

expand all

unified split

pkgs

build-support

setup-hooks

auto-patchelf.sh

stdenv

generic

setup.sh

pkgs/build-support/setup-hooks/auto-patchelf.sh

··· 29 isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ 30 | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" 31 # not using grep -q, because it can cause Broken pipe 32 [ -n "$isExeResult" ] 33 } 34

··· 29 isExeResult="$(LANG=C $READELF -h -l "$1" 2> /dev/null \ 30 | grep '^ *Type: *EXEC\>\|^ *INTERP\>')" 31 # not using grep -q, because it can cause Broken pipe 32 + # https://unix.stackexchange.com/questions/305547/broken-pipe-when-grepping-output-but-only-with-i-flag 33 [ -n "$isExeResult" ] 34 } 35

+1 -1

pkgs/stdenv/generic/setup.sh

··· 487 # build platform are included here. That would be `depsBuild*`, 488 # and legacy `nativeBuildInputs`, in general. If we aren't cross 489 # compiling, however, everything can be put on the PATH. To ease 490 - # the transition, we do include everything in thatcase. 491 # 492 # TODO(@Ericson2314): Don't special-case native compilation 493 if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then

··· 487 # build platform are included here. That would be `depsBuild*`, 488 # and legacy `nativeBuildInputs`, in general. If we aren't cross 489 # compiling, however, everything can be put on the PATH. To ease 490 + # the transition, we do include everything in that case. 491 # 492 # TODO(@Ericson2314): Don't special-case native compilation 493 if [[ -z "${strictDeps-}" || "$hostOffset" -le -1 ]]; then