c60ecc35da
See <https://bugzilla.gnome.org/show_bug.cgi?id=776504> for the license change. * gnu/packages/patches/glib-respect-datadir.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/glib.scm (glib): Update to 2.54.1. [source](patches): Add 'glib-respect-datadir.patch'. [arguments]<#:phases>: Re-enable timezone test. [license]: Change to LGPL2.1+.
22 lines
853 B
Diff
22 lines
853 B
Diff
On Guix, Python modules are in a different output from the executables,
|
|
so searching "../share/glib-2.0" will not work.
|
|
|
|
This patch restores behaviour prior to this commit:
|
|
<https://git.gnome.org/browse/glib/commit/?id=fe2a9887a8ccb14f2386e01b14834e97a33bc2d7>
|
|
|
|
--- a/gio/gdbus-2.0/codegen/gdbus-codegen.in
|
|
+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in
|
|
@@ -25,9 +25,12 @@
|
|
|
|
srcdir = os.getenv('UNINSTALLED_GLIB_SRCDIR', None)
|
|
filedir = os.path.dirname(__file__)
|
|
+datadir = os.path.join('@datadir@', 'glib-2.0')
|
|
|
|
if srcdir is not None:
|
|
path = os.path.join(srcdir, 'gio', 'gdbus-2.0')
|
|
+elif os.path.exists(os.path.join(datadir, 'codegen')):
|
|
+ path = datadir
|
|
elif os.path.basename(filedir) == 'bin':
|
|
# Make the prefix containing gdbus-codegen 'relocatable' at runtime by
|
|
# adding /some/prefix/bin/../share/glib-2.0 to the python path
|