diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-12-10 23:57:57 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-10 23:57:57 -0500 |
| commit | 25879b3ebbf3c78f4f8cb22c20e33dfc0719d738 (patch) | |
| tree | 7367c32e829e0c41b69ac463de12cc0c432cad27 /pkgs/build-support | |
| parent | c0ea42c846004d53e079f88e436bd6864cd0ab09 (diff) | |
| parent | 2c8c8f29615e586e51a0cb864c51a7fcfd6ca7bd (diff) | |
| download | nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar.gz nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar.bz2 nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar.lz nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar.xz nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.tar.zst nixpkgs-25879b3ebbf3c78f4f8cb22c20e33dfc0719d738.zip | |
Merge pull request #75450 from KoviRobi/fix-wrap-gapps-hook-shell-quoting
wrapGAppsHook: don't add empty variables (see also #75443)
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/setup-hooks/wrap-gapps-hook.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh index a05d4f689db..ff0cda7eaf0 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook.sh @@ -42,7 +42,9 @@ wrapGAppsHook() { fi for v in ${wrapPrefixVariables:-} GST_PLUGIN_SYSTEM_PATH_1_0 GI_TYPELIB_PATH GRL_PLUGIN_PATH; do - gappsWrapperArgs+=(--prefix "$v" : "${!v}") + if [ -n "${!v}" ]; then + gappsWrapperArgs+=(--prefix "$v" : "${!v}") + fi done if [[ -z "${dontWrapGApps:-}" ]]; then |