diff options
| author | Lancelot SIX <lsix@lancelotsix.com> | 2018-02-23 09:51:10 +0100 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2018-03-05 15:12:52 +0100 |
| commit | 0b455cec930910cdaf128a246a1cb110c0738ae2 (patch) | |
| tree | 3a0d037a3ab95fe1b0f13310fd897b45b5d211cd /pkgs/tools/security/gnupg | |
| parent | fe5f012d074e9d7fb332288b53bd90b8587bf134 (diff) | |
| download | nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar.gz nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar.bz2 nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar.lz nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar.xz nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.tar.zst nixlib-0b455cec930910cdaf128a246a1cb110c0738ae2.zip | |
gnupg: 2.2.4 -> 2.2.5
See http://lists.gnu.org/archive/html/info-gnu/2018-02/msg00005.html for release information
Diffstat (limited to 'pkgs/tools/security/gnupg')
| -rw-r--r-- | pkgs/tools/security/gnupg/22.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/security/gnupg/fix-libusb-include-path.patch | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/tools/security/gnupg/22.nix b/pkgs/tools/security/gnupg/22.nix index 89fee90364e8..c47780588cd7 100644 --- a/pkgs/tools/security/gnupg/22.nix +++ b/pkgs/tools/security/gnupg/22.nix @@ -15,11 +15,11 @@ assert guiSupport -> pinentry != null; stdenv.mkDerivation rec { name = "gnupg-${version}"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "1v7j8v2ww1knknbrhw3svfrqkmf9ll58iq0dczbsdpqgg1j3w6j0"; + sha256 = "0mzgibq4dpxh3i9anmwg12xdjry28y83icafhx3j3djg5niqk89z"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch index 18c4f1107388..a5432f8e3d95 100644 --- a/pkgs/tools/security/gnupg/fix-libusb-include-path.patch +++ b/pkgs/tools/security/gnupg/fix-libusb-include-path.patch @@ -1,10 +1,11 @@ --- a/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_n "checking libusb include dir... " >&6; } 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 _libusb_save_cppflags=$CPPFLAGS if test -n "${_incdir}"; then |