public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gpgme: 1.12.0 -> 1.13.0

Browse Source 
https://lists.gnupg.org/pipermail/gnupg-announce/2019q1/000437.html

Drop autoreconfHook and git, otherwise version contains `-unknown`
which is unfortunate but also breaks build w/seahorse.
This commit is contained in:
Will Dietz 2019-03-26 13:09:17 -05:00
parent 0ddae82e6a
commit 5c280ce1e4
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/development/libraries/gpgme/default.nix
View File

@ -1,7 +1,5 @@
{ stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan { stdenv, fetchurl, libgpgerror, gnupg, pkgconfig, glib, pth, libassuan
, file, which, ncurses , file, which, ncurses
, autoreconfHook, fetchpatch
, git
, texinfo , texinfo
, buildPackages , buildPackages
, qtbase ? null , qtbase ? null
@ -15,11 +13,11 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "gpgme-${version}"; name = "gpgme-${version}";
version = "1.12.0"; version = "1.13.0";
src = fetchurl { src = fetchurl {
url = "mirror://gnupg/gpgme/${name}.tar.bz2"; url = "mirror://gnupg/gpgme/${name}.tar.bz2";
sha256 = "1n4c1q2ls7sqx1vpr3p5n8vbjkw6kqp8jxqa28p0x9j36wf9bp5l"; sha256 = "0c6676g0yhfsmy32i1dgwh5cx0ja8vhcqf4k08zad177m53kxcnl";
}; };
outputs = [ "out" "dev" "info" ]; outputs = [ "out" "dev" "info" ];
@ -29,19 +27,11 @@ stdenv.mkDerivation rec {
[ libgpgerror glib libassuan pth ] [ libgpgerror glib libassuan pth ]
++ lib.optional (qtbase != null) qtbase; ++ lib.optional (qtbase != null) qtbase;
nativeBuildInputs = [ file pkgconfig gnupg autoreconfHook git texinfo ] nativeBuildInputs = [ file pkgconfig gnupg texinfo ]
++ lib.optionals pythonSupport [ python swig2 which ncurses ]; ++ lib.optionals pythonSupport [ python swig2 which ncurses ];
depsBuildBuild = [ buildPackages.stdenv.cc ]; 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 ='' postPatch =''
substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file
''; '';