gnupg: 2.2.4 -> 2.2.5
See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00005.html for release information
This commit is contained in:
parent
fe5f012d07
commit
0b455cec93
|
@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null;
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
name = "gnupg-${version}";
|
name = "gnupg-${version}";
|
||||||
|
|
||||||
version = "2.2.4";
|
version = "2.2.5";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchurl {
|
||||||
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
|
url = "mirror://gnupg/gnupg/${name}.tar.bz2";
|
||||||
sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0";
|
sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ pkgconfig ];
|
nativeBuildInputs = [ pkgconfig ];
|
||||||
|
|
|
@ -1,10 +1,11 @@
|
||||||
--- a/configure
|
--- a/configure
|
||||||
+++ b/configure
|
+++ b/configure
|
||||||
@@ -8872,7 +8872,7 @@
|
@@ -8987,8 +8987,7 @@
|
||||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
|
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking libusb include dir" >&5
|
||||||
$as_echo_n "checking libusb include dir... " >&6; }
|
$as_echo_n "checking libusb include dir... " >&6; }
|
||||||
usb_incdir_found="no"
|
usb_incdir_found="no"
|
||||||
- for _incdir in "" "/usr/include/libusb-1.0" "/usr/local/include/libusb-1.0"; do
|
- for _incdir in "" "/usr/include/libusb-1.0" \
|
||||||
|
- "/usr/local/include/libusb-1.0" "/usr/pkg/include/libusb-1.0"; do
|
||||||
+ for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
|
+ for _incdir in "$($PKG_CONFIG --variable=includedir libusb-1.0)/libusb-1.0"; do
|
||||||
_libusb_save_cppflags=$CPPFLAGS
|
_libusb_save_cppflags=$CPPFLAGS
|
||||||
if test -n "${_incdir}"; then
|
if test -n "${_incdir}"; then
|
||||||
|
|
Loading…
Reference in a new issue