diff options
author | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2020-04-27 21:04:56 +0000 |
commit | a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e (patch) | |
tree | 47950e79183035018882419c4eff5047d1537b99 /nixpkgs/pkgs/development/libraries/dconf/default.nix | |
parent | 5b00523fb58512232b819a301c4309f579c7f09c (diff) | |
parent | 22a3bf9fb9edad917fb6cd1066d58b5e426ee975 (diff) | |
download | nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.gz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.bz2 nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.lz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.xz nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.tar.zst nixlib-a4e6c7d26af697f4346cacb7ab18dcd7fcfc056e.zip |
Merge commit '22a3bf9fb9edad917fb6cd1066d58b5e426ee975'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/dconf/default.nix')
-rw-r--r-- | nixpkgs/pkgs/development/libraries/dconf/default.nix | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/nixpkgs/pkgs/development/libraries/dconf/default.nix b/nixpkgs/pkgs/development/libraries/dconf/default.nix index 5b37088cd95f..d4e303b67af7 100644 --- a/nixpkgs/pkgs/development/libraries/dconf/default.nix +++ b/nixpkgs/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 @@ -29,7 +21,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "lib" "dev" "devdoc" ]; - nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 gtk-doc docbook_xsl docbook_xml_dtd_42 ]; + nativeBuildInputs = [ meson ninja vala pkgconfig python3 libxslt libxml2 glib gtk-doc docbook_xsl docbook_xml_dtd_42 ]; buildInputs = [ glib bash-completion dbus ]; mesonFlags = [ @@ -42,14 +34,13 @@ stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "gnome3.${pname}"; }; }; meta = with stdenv.lib; { - homepage = https://wiki.gnome.org/Projects/dconf; + homepage = "https://wiki.gnome.org/Projects/dconf"; license = licenses.lgpl21Plus; platforms = platforms.linux ++ platforms.darwin; - maintainers = gnome3.maintainers; + maintainers = teams.gnome.members; }; } |