jolheiser/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glib.setupHook: fix gsettings-schemas location

Browse Source 
GLib setup hook expects GSettings schemas to be installed in ${!outputLib}
and tries to move them to gsettings-schemas/$name subdirectory to prevent
conflicts. But the schemas will only end up in the library output when
the build system recognizes makeFlags set by the setup hook, and in that case
the move is not necessary, since the flag already includes the subdirectory.

Normally, this is not an issue, since most packages relying on GSettings
schemas either still use Autotools with gsettings.m4, or do not have a lib
output set. But with the promulgation of multiple outputs in Nixpkgs and
more and more projects switching to Meson, the issue will become increasingly
common.

We first noticed this problem with nm-applet.

Closes https://github.com/NixOS/nixpkgs/issues/45043
This commit is contained in:
Jan Tojnar 2019-01-17 00:15:20 +01:00
parent 626233eee6
commit 388faed25c
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,9 +15,9 @@ preInstallPhases+=" glibPreInstallPhase"
glibPreFixupPhase() {
# Move gschemas in case the install flag didn't help
if [ -d "${!outputLib}/share/glib-2.0/schemas" ]; then
if [ -d "$prefix/share/glib-2.0/schemas" ]; then
mkdir -p "${!outputLib}/share/gsettings-schemas/$name/glib-2.0"
mv "${!outputLib}/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/"
mv "$prefix/share/glib-2.0/schemas" "${!outputLib}/share/gsettings-schemas/$name/glib-2.0/"
fi
addToSearchPath GSETTINGS_SCHEMAS_PATH "${!outputLib}/share/gsettings-schemas/$name"