pyrox.dev
lol
Merge #31683: glib: Add variable for overriding schemas
+15
-2
+1
-1
nixos/modules/services/x11/desktop-managers/gnome3.nix
+1
-1
nixos/modules/services/x11/desktop-managers/gnome3.nix
···
152
152
export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}${mimeAppsList}/share
153
153
154
154
# Override gsettings-desktop-schema
155
-
export XDG_DATA_DIRS=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides''${XDG_DATA_DIRS:+:}$XDG_DATA_DIRS
155
+
export NIX_GSETTINGS_OVERRIDES_DIR=${nixos-gsettings-desktop-schemas}/share/gsettings-schemas/nixos-gsettings-overrides/glib-2.0/schemas
156
156
157
157
# Let nautilus find extensions
158
158
export NAUTILUS_EXTENSION_DIR=${config.system.path}/lib/nautilus/extensions-3.0/
+2
-1
pkgs/development/libraries/glib/default.nix
+2
-1
pkgs/development/libraries/glib/default.nix
···
55
55
};
56
56
57
57
patches = optional stdenv.isDarwin ./darwin-compilation.patch
58
-
++ optional doCheck ./skip-timer-test.patch;
58
+
++ optional doCheck ./skip-timer-test.patch
59
+
++ [ ./schema-override-variable.patch ];
59
60
60
61
outputs = [ "out" "dev" "devdoc" ];
61
62
outputBin = "dev";
+12
pkgs/development/libraries/glib/schema-override-variable.patch
+12
pkgs/development/libraries/glib/schema-override-variable.patch
···
1
+
--- a/gio/gsettingsschema.c
2
+
+++ b/gio/gsettingsschema.c
3
+
@@ -352,6 +352,9 @@
4
+
5
+
try_prepend_data_dir (g_get_user_data_dir ());
6
+
7
+
+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
8
+
+ try_prepend_dir (path);
9
+
+
10
+
if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
11
+
try_prepend_dir (path);
12
+