JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8b2d889aeb
nixpkgs/pkgs/development/libraries/glib/schema-override-variable.patch

15 lines
578 B
Diff
Raw Normal View History

glib: 2.66.4 -> 2.66.8 rebased the schema override patch, adding the same upstream safety but not duplicating the ability to pass multiple directories as this does not appear to be necessary for nix overrides
2021-03-08 17:56:53 +00:00
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 1282c10a1..feadfe3aa 100644
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable For some reason, the GNOME 3.26 update broke the overrides. It turns out the overrides now need to come before the overriden schemas in the XDG_DATA_DIRS variable. This is not possible in general due to applications prefixing the variable (e.g. in wrapGAppsHook). To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR was introduced. It has greater priority than XDG_DATA_DIRS but lower than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not to block the built-in one for users.
2017-11-15 02:36:35 +00:00
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
glib: 2.66.4 -> 2.66.8 rebased the schema override patch, adding the same upstream safety but not duplicating the ability to pass multiple directories as this does not appear to be necessary for nix overrides
2021-03-08 17:56:53 +00:00
@@ -360,6 +360,9 @@ initialise_schema_sources (void)
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable For some reason, the GNOME 3.26 update broke the overrides. It turns out the overrides now need to come before the overriden schemas in the XDG_DATA_DIRS variable. This is not possible in general due to applications prefixing the variable (e.g. in wrapGAppsHook). To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR was introduced. It has greater priority than XDG_DATA_DIRS but lower than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not to block the built-in one for users.
2017-11-15 02:36:35 +00:00
try_prepend_data_dir (g_get_user_data_dir ());
glib: 2.66.4 -> 2.66.8 rebased the schema override patch, adding the same upstream safety but not duplicating the ability to pass multiple directories as this does not appear to be necessary for nix overrides
2021-03-08 17:56:53 +00:00
+ if (!is_setuid && (path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
glib: recognize NIX_GSETTINGS_OVERRIDES_DIR variable For some reason, the GNOME 3.26 update broke the overrides. It turns out the overrides now need to come before the overriden schemas in the XDG_DATA_DIRS variable. This is not possible in general due to applications prefixing the variable (e.g. in wrapGAppsHook). To fix this, a new environment variable NIX_GSETTINGS_OVERRIDES_DIR was introduced. It has greater priority than XDG_DATA_DIRS but lower than GSETTINGS_SCHEMA_DIR. A separate variable was chosen in order not to block the built-in one for users.
2017-11-15 02:36:35 +00:00
+ try_prepend_dir (path);
+
glib: 2.66.4 -> 2.66.8 rebased the schema override patch, adding the same upstream safety but not duplicating the ability to pass multiple directories as this does not appear to be necessary for nix overrides
2021-03-08 17:56:53 +00:00
/* Disallow loading extra schemas if running as setuid, as that could
* allow reading privileged files. */
if (!is_setuid && (path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
Reference in New Issue Copy Permalink