From 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 5 Apr 2014 12:53:28 +0200 Subject: [PATCH] glib gschemas hook: fixup #1901 - move frome $out to $out/share - fix quoting that prevented globbing - indent by spaces (as it is more common in nixpkgs; 4 spaces for shell) More work is still needed for some individual packages. --- pkgs/development/libraries/glib/setup-hook.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/glib/setup-hook.sh b/pkgs/development/libraries/glib/setup-hook.sh index e5c0c372da0..f173744e5ca 100644 --- a/pkgs/development/libraries/glib/setup-hook.sh +++ b/pkgs/development/libraries/glib/setup-hook.sh @@ -1,17 +1,17 @@ # Install gschemas, if any, in a package-specific directory -installFlagsArray+=("gsettingsschemadir=$out/gsettings-schemas/$name/glib-2.0/schemas/") +installFlagsArray+=("gsettingsschemadir=$out/share/gsettings-schemas/$name/glib-2.0/schemas/") make_glib_find_gsettings_schemas() { - # For packages that need gschemas of other packages (e.g. empathy) - if [ -d "$1/gsettings-schemas/*/glib-2.0/schemas" ]; then - addToSearchPath GSETTINGS_SCHEMAS_PATH "$1/gsettings-schemas/"* - fi + # 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 } envHooks+=(make_glib_find_gsettings_schemas) glibPreFixupPhase() { - addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/gsettings-schemas/$name" + addToSearchPath GSETTINGS_SCHEMAS_PATH "$out/share/gsettings-schemas/$name" } preFixupPhases="$preFixupPhases glibPreFixupPhase"