nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-04-14 01:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

glib gschemas hook: fixup #1901

Browse Source 
- 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.
This commit is contained in:
Vladimír Čunát 2014-04-05 12:53:28 +02:00
parent 13bef7f403
commit 85b1ede2bf
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/development/libraries/glib/setup-hook.sh
View File

@ -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"