summary refs log tree commit diff
path: root/pkgs/development/libraries/dconf
diff options
context:
space:
mode:
authorTor Hedin Brønner <torhedinbronner@gmail.com>2020-02-09 00:12:26 +0100
committerJan Tojnar <jtojnar@gmail.com>2020-03-24 07:07:00 +0100
commit374233c727dec92418031ba8d97ebb5366a48074 (patch)
treea6d7bb1366909e24a511b4de5dd5d8c510428ca2 /pkgs/development/libraries/dconf
parent5398947fbd61477d163631e51fb0591ad095add4 (diff)
downloadnixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar.gz
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar.bz2
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar.lz
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar.xz
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.tar.zst
nixpkgs-374233c727dec92418031ba8d97ebb5366a48074.zip
dconf: 0.34.0 -> 0.36.0
Diffstat (limited to 'pkgs/development/libraries/dconf')
-rw-r--r--pkgs/development/libraries/dconf/default.nix14
1 files changed, 3 insertions, 11 deletions
diff --git a/pkgs/development/libraries/dconf/default.nix b/pkgs/development/libraries/dconf/default.nix
index 3df0088ee1e..9949a64802e 100644
--- a/pkgs/development/libraries/dconf/default.nix
+++ b/pkgs/development/libraries/dconf/default.nix
@@ -1,26 +1,18 @@
 { stdenv, fetchurl, meson, ninja, python3, vala, libxslt, pkgconfig, glib, bash-completion, dbus, gnome3
-, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42, fetchpatch }:
+, libxml2, gtk-doc, docbook_xsl, docbook_xml_dtd_42 }:
 
 let
   pname = "dconf";
 in
 stdenv.mkDerivation rec {
   name = "${pname}-${version}";
-  version = "0.34.0";
+  version = "0.36.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz";
-    sha256 = "0lnsl85cp2vpzgp8pkf6l6yd2i3lp02jdvga1icfa78j2smr8fll";
+    sha256 = "0bfs069pjv6lhp7xrzmrhz3876ay2ryqxzc6mlva1hhz34ibprlz";
   };
 
-  patches = [
-    # Fix build with Meson 0.52
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/GNOME/dconf/commit/cc32667c5d7d9ff95e65cc21f59905d8f9218394.patch";
-      sha256 = "02gfadn34bg818a7vb3crhsiahskiflcvx9l6iqwf1v269q93mr8";
-    })
-  ];
-
   postPatch = ''
     chmod +x meson_post_install.py tests/test-dconf.py
     patchShebangs meson_post_install.py