Merge remote-tracking branch 'origin/master' into hardened-stdenv

1 files changed, 9 insertions, 4 deletions

diff --git a/pkgs/tools/networking/lftp/default.nix b/pkgs/tools/networking/lftp/default.nix
index ea7ec605e2bf..bf39c36e02b8 100644
--- a/pkgs/tools/networking/lftp/default.nix
+++ b/pkgs/tools/networking/lftp/default.nix
@@ -1,17 +1,22 @@
-{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib }:
+{ stdenv, fetchurl, gnutls, pkgconfig, readline, zlib, libidn }:
 
 stdenv.mkDerivation rec {
-  name = "lftp-4.6.4";
+  name = "lftp-4.7.1";
 
   src = fetchurl {
     urls = [
       "http://lftp.yar.ru/ftp/${name}.tar.bz2"
       "http://lftp.yar.ru/ftp/old/${name}.tar.bz2"
       ];
-    sha256 = "0zj0dd6s3nzwdawxjp0xw31ipsa4vzimmg5bzq952q2f29vd0akn";
+    sha256 = "0n4l0n6ra6z5lh6v79hc0r0hhrsq0l6c47ir15vmq80sbgc9mmwv";
   };
 
-  buildInputs = [ gnutls pkgconfig readline zlib ];
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gnutls readline zlib libidn ];
+
+  configureFlags = [
+    "--with-readline=${readline}"
+  ];
 
   meta = with stdenv.lib; {
     description = "A file transfer program supporting a number of network protocols";