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

glib: 2.66.4 -> 2.66.8

Browse Source 
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
This commit is contained in:
Maxine Aubrey
2021-03-08 18:56:53 +01:00
parent 05f0cf4acf
commit 7cc6abc790
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/development/libraries/glib/default.nix
View File

@@ -45,11 +45,11 @@ in
stdenv.mkDerivation rec {
pname = "glib";
version = "2.66.4";
version = "2.66.8";
src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
sha256 = "l9+GcOMvn9T3OSsJgOZh3WJQEgFdWDUNoeWOND9K+YQ=";
sha256 = "sha256-l7yH3ZE2VYmvXLv+oldIM66nobcYQP02Xs0oUsdrnIs=";
};
patches = optionals stdenv.isDarwin [

12
pkgs/development/libraries/glib/schema-override-variable.patch
View File

@@ -1,12 +1,14 @@
diff --git a/gio/gsettingsschema.c b/gio/gsettingsschema.c
index 1282c10a1..feadfe3aa 100644
--- a/gio/gsettingsschema.c
+++ b/gio/gsettingsschema.c
@@ -352,6 +352,9 @@
@@ -360,6 +360,9 @@ initialise_schema_sources (void)
try_prepend_data_dir (g_get_user_data_dir ());
+ if ((path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
+ if (!is_setuid && (path = g_getenv ("NIX_GSETTINGS_OVERRIDES_DIR")) != NULL)
+ try_prepend_dir (path);
+
if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)
try_prepend_dir (path);
/* 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)