diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:37:02 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-01-11 23:41:30 +0000 |
commit | 6c557e3f1c28cf87e9fba232811d6875dd1399c1 (patch) | |
tree | 035a071d5d8980df6de0fa42e2ef8fc0cce7055e /nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh | |
parent | da7500bc026e937ac7fce7b50f67a0e1765737a7 (diff) | |
parent | e4134747f5666bcab8680aff67fa3b63384f9a0f (diff) | |
download | nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.gz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.bz2 nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.lz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.xz nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.tar.zst nixlib-6c557e3f1c28cf87e9fba232811d6875dd1399c1.zip |
Merge commit 'e4134747f5666bcab8680aff67fa3b63384f9a0f'
Diffstat (limited to 'nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh')
-rw-r--r-- | nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh b/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh index 06891893e8c1..8b7012677cd5 100644 --- a/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/nixpkgs/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -19,9 +19,6 @@ assertExecutable() { # the environment # --unset VAR : remove VAR from the environment # --run COMMAND : run command before the executable -# The command can push extra flags to a magic list -# variable extraFlagsArray, which are then added to -# the invocation of the executable # --add-flags FLAGS : add FLAGS to invocation of executable # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP @@ -109,12 +106,8 @@ makeWrapper() { fi done - # Note: extraFlagsArray is an array containing additional flags - # that may be set by --run actions. - # Silence warning about unexpanded extraFlagsArray: - # shellcheck disable=SC2016 echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ - "$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper" + "$flagsBefore" '"$@"' >> "$wrapper" chmod +x "$wrapper" } |