gnome3.seahorse: 3.32.2 -> 3.34

* dropped gobject-introspection
This commit is contained in:
worldofpeace 2019-10-03 17:13:51 -04:00
parent b9c9ff9fb3
commit ca18f905df

View File

@ -1,39 +1,65 @@
{ stdenv, fetchurl, fetchpatch, vala, meson, ninja, libpwquality { stdenv
, pkgconfig, gtk3, glib, gobject-introspection , fetchurl
, wrapGAppsHook, itstool, gnupg, libsoup , fetchpatch
, gnome3, gpgme, python3, openldap, gcr , vala
, libsecret, avahi, p11-kit, openssh, gsettings-desktop-schemas }: , 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 { stdenv.mkDerivation rec {
pname = "seahorse"; pname = "seahorse";
version = "3.32.2"; version = "3.34";
src = fetchurl { src = fetchurl {
url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; 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; doCheck = true;
nativeBuildInputs = [ nativeBuildInputs = [
meson ninja pkgconfig vala itstool wrapGAppsHook meson
python3 gobject-introspection ninja
pkgconfig
vala
itstool
wrapGAppsHook
python3
]; ];
buildInputs = [ buildInputs = [
gtk3 glib gcr gtk3
gsettings-desktop-schemas gnupg glib
gnome3.adwaita-icon-theme gpgme gcr
libsecret avahi libsoup p11-kit gsettings-desktop-schemas
openssh openldap libpwquality gnupg
gnome3.adwaita-icon-theme
gpgme
libsecret
avahi
libsoup
p11-kit
openssh
openldap
libpwquality
]; ];
postPatch = '' postPatch = ''