diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-13 14:56:40 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-07-13 14:57:16 -0400 |
| commit | 273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b (patch) | |
| tree | d4544200a13673209c0f8773f77d11c43007e601 /pkgs/stdenv/generic/setup.sh | |
| parent | 5d693c84d2e492080e982bf7429d6e923229d721 (diff) | |
| download | nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar.gz nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar.bz2 nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar.lz nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar.xz nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.tar.zst nixlib-273a4c1c78d9e0b3aa852f197ce9ecc0e63ce42b.zip | |
stdenv-setup: Combine [[ .. ]] && [[ .. ]] into one [[ .. && .. ]]
Also remove useless quotes on same line
Diffstat (limited to 'pkgs/stdenv/generic/setup.sh')
| -rw-r--r-- | pkgs/stdenv/generic/setup.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 0d9a647a5c30..de83e4fb18f0 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -742,7 +742,7 @@ configurePhase() { buildPhase() { runHook preBuild - if [ -z "$makeFlags" ] && ! [[ -n "$makefile" || -e "Makefile" || -e "makefile" || -e "GNUmakefile" ]]; then + if [[ -z $makeFlags && ! ( -n $makefile || -e Makefile || -e makefile || -e GNUmakefile[[ ) ]]; then echo "no Makefile, doing nothing" else # See https://github.com/NixOS/nixpkgs/pull/1354#issuecomment-31260409 |