diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-04-05 12:53:28 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-04-05 13:01:51 +0200 |
| commit | 85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a (patch) | |
| tree | 8a05161df3cf265fc91487a035a5610ed954ba19 /pkgs/development/libraries | |
| parent | 13bef7f4034dd8f81542151c770fc22376244e90 (diff) | |
| download | nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar.gz nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar.bz2 nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar.lz nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar.xz nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.tar.zst nixpkgs-85b1ede2bfa8c8e7cf946a7372d3b05f15e7735a.zip | |
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.
Diffstat (limited to 'pkgs/development/libraries')
| -rw-r--r-- | pkgs/development/libraries/glib/setup-hook.sh | 12 |
1 files 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" |