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

Merge pull request #115436 from maxeaubrey/glib_2.66.7 

glib: 2.66.4 -> 2.66.8
This commit is contained in:
Jan Tojnar 2021-03-19 00:42:06 +01:00 committed by GitHub
parent de78745bdd 7cc6abc790
commit 07ac0c6d99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 7 deletions
Show Stats 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 { stdenv.mkDerivation rec {
pname = "glib"; pname = "glib";
version = "2.66.4"; version = "2.66.8";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/glib/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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 [ 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 --- a/gio/gsettingsschema.c
+++ b/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 ()); 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); + try_prepend_dir (path);
+ +
if ((path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL) /* Disallow loading extra schemas if running as setuid, as that could
try_prepend_dir (path); * allow reading privileged files. */
if (!is_setuid && (path = g_getenv ("GSETTINGS_SCHEMA_DIR")) != NULL)