pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #69370 from chkno/no-extra-flags

makeWrapper: Remove unused extraFlagsArray feature

authored by

Robin Gloster and committed by
GitHub 35646438 72531b18

+5 -12
unified split
+1 -8
pkgs/build-support/setup-hooks/make-wrapper.sh
··· 19 # the environment 20 # --unset VAR : remove VAR from the environment 21 # --run COMMAND : run command before the executable 22 - # The command can push extra flags to a magic list 23 - # variable extraFlagsArray, which are then added to 24 - # the invocation of the executable 25 # --add-flags FLAGS : add FLAGS to invocation of executable 26 27 # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP ··· 109 fi 110 done 111 112 - # Note: extraFlagsArray is an array containing additional flags 113 - # that may be set by --run actions. 114 - # Silence warning about unexpanded extraFlagsArray: 115 - # shellcheck disable=SC2016 116 echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ 117 - "$flagsBefore" '"${extraFlagsArray[@]}"' '"$@"' >> "$wrapper" 118 119 chmod +x "$wrapper" 120 }
··· 19 # the environment 20 # --unset VAR : remove VAR from the environment 21 # --run COMMAND : run command before the executable 22 # --add-flags FLAGS : add FLAGS to invocation of executable 23 24 # --prefix ENV SEP VAL : suffix/prefix ENV with VAL, separated by SEP ··· 106 fi 107 done 108 109 echo exec ${argv0:+-a \"$argv0\"} \""$original"\" \ 110 + "$flagsBefore" '"$@"' >> "$wrapper" 111 112 chmod +x "$wrapper" 113 }
+1 -1
pkgs/desktops/gnustep/make/builder.sh
··· 16 17 export GNUSTEP_CONFIG_FILE="$config" 18 19 - exec "$wrapped" "\$@" "\${extraFlagsArray[@]}" 20 EOF 21 chmod +x "$program" 22 }
··· 16 17 export GNUSTEP_CONFIG_FILE="$config" 18 19 + exec "$wrapped" "\$@" 20 EOF 21 chmod +x "$program" 22 }
+1 -1
pkgs/development/tools/misc/ccls/wrapper
··· 9 10 initString+="]}}" 11 12 - exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"
··· 9 10 initString+="]}}" 11 12 + exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"
+1 -1
pkgs/development/tools/misc/cquery/wrapper
··· 9 10 initString+="]}" 11 12 - exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "${extraFlagsArray[@]}" "$@"
··· 9 10 initString+="]}" 11 12 + exec -a "$0" "@out@/bin/@wrapped@" "${initString}" "$@"
+1 -1
pkgs/games/simutrans/default.nix
··· 97 cat > "$out/bin/simutrans" <<EOF 98 #!${runtimeShell} 99 cd "$out"/share/simutrans 100 - exec "${binaries}/bin/simutrans" -use_workdir "\''${extraFlagsArray[@]}" "\$@" 101 EOF 102 chmod +x "$out/bin/simutrans" 103 '';
··· 97 cat > "$out/bin/simutrans" <<EOF 98 #!${runtimeShell} 99 cd "$out"/share/simutrans 100 + exec "${binaries}/bin/simutrans" -use_workdir "\$@" 101 EOF 102 chmod +x "$out/bin/simutrans" 103 '';