Merge pull request #58388 from dtzWill/update/gpgme-1.13.0
gpgme: 1.12.0 -> 1.13.0
This commit is contained in:
commit
15c05c6c15
@ -1,7 +1,5 @@
|
||||
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
|
||||
, file, which, ncurses
|
||||
, autoreconfHook, fetchpatch
|
||||
, git
|
||||
, texinfo
|
||||
, buildPackages
|
||||
, qtbase ? null
|
||||
@ -15,11 +13,11 @@ in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gpgme-${version}";
|
||||
version = "1.12.0";
|
||||
version = "1.13.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://gnupg/gpgme/${name}.tar.bz2";
|
||||
sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l";
|
||||
sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl";
|
||||
};
|
||||
|
||||
outputs = [ "out" "dev" "info" ];
|
||||
@ -29,19 +27,11 @@ stdenv.mkDerivation rec {
|
||||
[ libgpgerror glib libassuan pth ]
|
||||
++ lib.optional (qtbase != null) qtbase;
|
||||
|
||||
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ]
|
||||
nativeBuildInputs = [ file pkgconfig gnupg texinfo ]
|
||||
++ lib.optionals pythonSupport [ python swig2 which ncurses ];
|
||||
|
||||
depsBuildBuild = [ buildPackages.stdenv.cc ];
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "fix-key-expiry.patch";
|
||||
url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;a=patch;h=66376f3e206a1aa791d712fb8577bb3490268f60";
|
||||
sha256 = "0i777dzcbv4r568l8623ar6y6j44bv46bbxi751qa5mdcihpya02";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch =''
|
||||
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
|
||||
'';
|
||||
|
Loading…
Reference in New Issue
Block a user