diff options
| author | John Ericson <git@JohnEricson.me> | 2019-11-08 15:26:14 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-08 15:26:14 -0500 |
| commit | 5132cc822a768ce389ea7dc7d3a016647a356bd2 (patch) | |
| tree | 19eda59dc41d4d7852660e7580cf0ce3898b7317 /pkgs/development/libraries/glib | |
| parent | d3cf60344bedc94b7f83528c8059cf19637c1a0a (diff) | |
| parent | f7fdc997bf0748a49dea2e0e5451a21da02ee4c1 (diff) | |
| download | nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar.gz nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar.bz2 nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar.lz nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar.xz nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.tar.zst nixpkgs-5132cc822a768ce389ea7dc7d3a016647a356bd2.zip | |
Merge pull request #72812 from NixOS/bash-no-undef-vars
cc-wrapper, bintools-wrapper: Remove now unneeded `set {+,-}u`Diffstat (limited to 'pkgs/development/libraries/glib')
| -rw-r--r-- | pkgs/development/libraries/glib/setup-hook.sh | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index a1cb1f40c58..20714ea7ab8 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,9 +1,11 @@ make_glib_find_gsettings_schemas() { # For packages that need gschemas of other packages (e.g. empathy) - if [ -d "$1"/share/gsettings-schemas/*/glib-2.0/schemas ]; then - addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/share/gsettings-schemas/"* - fi + for maybe_dir in "$1"/share/gsettings-schemas/*/glib-2.0; do + if [[ -d "$maybe_dir/schemas" ]]; then + addToSearchPath GSETTINGS_SCHEMAS_PATH "$maybe_dir" + fi + done } addEnvHooks "$hostOffset" make_glib_find_gsettings_schemas |