ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-09-21 12:38:41 +03:00
Code Issues Projects Releases Wiki Activity

gnome.dconf-editor: 43.0 → 45.0.1

Browse Source 
https://gitlab.gnome.org/GNOME/dconf-editor/-/compare/43.0...45.0.1

- Ensure a type is available for ui file.
- Support multiple paths in GSETTINGS_SCHEMA_DIR environment variable.
  Not changing NIX_GSETTINGS_OVERRIDES_DIR patch since the glib patch
  does not support multiple directories.
- Use Meson’s post install mechanism.

9643dbba76

Changelog-reviewed-by: Bobby Rong <rjl931189261@126.com>
Changelog-reviewed-by: Jan Tojnar <jtojnar@gmail.com>
Co-authored-by: Jan Tojnar <jtojnar@gmail.com>
This commit is contained in:
Bobby Rong 2023-09-21 14:50:50 +00:00 committed by Jan Tojnar
parent d10e19c7dd
commit f6532d2caf
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkgs/desktops/gnome/core/dconf-editor/default.nix
View File

@ -2,6 +2,7 @@
, stdenv , stdenv
, fetchurl , fetchurl
, fetchpatch , fetchpatch
, desktop-file-utils
, meson , meson
, ninja , ninja
, vala , vala
@ -11,7 +12,6 @@
, gtk3 , gtk3
, libhandy , libhandy
, gnome , gnome
, python3
, dconf , dconf
, libxml2 , libxml2
, gettext , gettext
@ -22,20 +22,27 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "dconf-editor"; pname = "dconf-editor";
version = "43.0"; version = "45.0.1";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz"; url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
sha256 = "sha256-k1o8Lddswqk81a7ppU05R/sRHrOW9LY9xfC6j40JkTY="; sha256 = "sha256-EYApdnju2uYhfMUUomOMGH0vHR7ycgy5B5t0DEKZQd0=";
}; };
patches = [ patches = [
# Fix crash with GSETTINGS_SCHEMA_DIR env var.
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/dconf-editor/-/commit/baf183737d459dcde065c9f8f6fe5be7ed874de6.patch";
hash = "sha256-Vp0qjJChDr6IarUD+tZPLJhdI8v8r6EzWNfqFSnGvqQ=";
})
# Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR # Look for compiled schemas in NIX_GSETTINGS_OVERRIDES_DIR
# environment variable, to match what we patched GLib to do. # environment variable, to match what we patched GLib to do.
./schema-override-variable.patch ./schema-override-variable.patch
]; ];
nativeBuildInputs = [ nativeBuildInputs = [
desktop-file-utils
meson meson
ninja ninja
vala vala
@ -46,7 +53,6 @@ stdenv.mkDerivation rec {
docbook-xsl-nons docbook-xsl-nons
libxml2 libxml2
gobject-introspection gobject-introspection
python3
]; ];
buildInputs = [ buildInputs = [
@ -56,11 +62,6 @@ stdenv.mkDerivation rec {
dconf dconf
]; ];
postPatch = ''
chmod +x meson_post_install.py
patchShebangs meson_post_install.py
'';
passthru = { passthru = {
updateScript = gnome.updateScript { updateScript = gnome.updateScript {
packageName = pname; packageName = pname;

4
pkgs/desktops/gnome/core/dconf-editor/schema-override-variable.patch
View File

@ -10,5 +10,5 @@ index 27b2b17a..87f7ba86 100644
+ if (nix_var_schema_dir != null) + if (nix_var_schema_dir != null)
+ source = try_prepend_dir (source, (!) nix_var_schema_dir); + source = try_prepend_dir (source, (!) nix_var_schema_dir);
string? var_schema_dir = GLib.Environment.get_variable ("GSETTINGS_SCHEMA_DIR"); string? var_schema_dir = GLib.Environment.get_variable ("GSETTINGS_SCHEMA_DIR");
if (var_schema_dir != null) if (var_schema_dir != null) {
source = try_prepend_dir (source, (!) var_schema_dir); string[] extra_schema_dirs = ((!) var_schema_dir).split (Path.SEARCHPATH_SEPARATOR_S);