From ca18f905df34e659fb3187fd7f311f636defd707 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 3 Oct 2019 17:13:51 -0400 Subject: [PATCH] gnome3.seahorse: 3.32.2 -> 3.34 * dropped gobject-introspection --- .../gnome-3/apps/seahorse/default.nix | 72 +++++++++++++------ 1 file changed, 49 insertions(+), 23 deletions(-) diff --git a/pkgs/desktops/gnome-3/apps/seahorse/default.nix b/pkgs/desktops/gnome-3/apps/seahorse/default.nix index 670cbabf362..c6d5b22f934 100644 --- a/pkgs/desktops/gnome-3/apps/seahorse/default.nix +++ b/pkgs/desktops/gnome-3/apps/seahorse/default.nix @@ -1,39 +1,65 @@ -{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality -, pkgconfig, gtk3, glib, gobject-introspection -, wrapGAppsHook, itstool, gnupg, libsoup -, gnome3, gpgme, python3, openldap, gcr -, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }: +{ stdenv +, fetchurl +, fetchpatch +, vala +, meson +, ninja +, libpwquality +, pkgconfig +, gtk3 +, glib +, wrapGAppsHook +, itstool +, gnupg +, libsoup +, gnome3 +, gpgme +, python3 +, openldap +, gcr +, libsecret +, avahi +, p11-kit +, openssh +, gsettings-desktop-schemas +}: stdenv.mkDerivation rec { pname = "seahorse"; - version = "3.32.2"; + version = "3.34"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0d8zdzmlz7fjv9xl20zl4ckidf465mvdjnbpxy3k08y9iw423q4x"; + sha256 = "16sfnqrdlr5xx6kixx2ln1mva7nngjlw1k3f5n454vyaigffjh2v"; }; - patches = [ - # fix build with recent libsecret - # https://gitlab.gnome.org/GNOME/seahorse/merge_requests/83 - (fetchpatch { - url = https://gitlab.gnome.org/GNOME/seahorse/commit/d9db29db567012b7c72e85e1be1fbf55fcc9b667.patch; - sha256 = "004zgs0n0hfc4yfmiy9lj37d67m7wxdf42sf7bzn2c3hcvpl0rcj"; - }) - ]; - doCheck = true; nativeBuildInputs = [ - meson ninja pkgconfig vala itstool wrapGAppsHook - python3 gobject-introspection + meson + ninja + pkgconfig + vala + itstool + wrapGAppsHook + python3 ]; + buildInputs = [ - gtk3 glib gcr - gsettings-desktop-schemas gnupg - gnome3.adwaita-icon-theme gpgme - libsecret avahi libsoup p11-kit - openssh openldap libpwquality + gtk3 + glib + gcr + gsettings-desktop-schemas + gnupg + gnome3.adwaita-icon-theme + gpgme + libsecret + avahi + libsoup + p11-kit + openssh + openldap + libpwquality ]; postPatch = ''