From 900326fdc0d3a6e5ed9feb8a07b508423f2a9905 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Mon, 6 Feb 2017 13:16:44 +0100 Subject: [PATCH] wget: add some more dependencies & small cleanups cc #22416 --- pkgs/tools/networking/wget/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 105f0692a4d..60edc1ad16f 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, gettext, libidn2, pkgconfig -, perl, perlPackages, LWP, python3 -, libiconv, libpsl ? null, openssl ? null }: +{ stdenv, fetchurl, gettext, pkgconfig, perl +, libidn2, zlib, pcre, libuuid, libiconv +, IOSocketSSL, LWP, python3 +, libpsl ? null +, openssl ? null }: stdenv.mkDerivation rec { name = "wget-1.19"; @@ -26,9 +28,10 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ gettext pkgconfig perl ]; - buildInputs = [ libidn2 libiconv libpsl ] - ++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ] + buildInputs = [ libidn2 libiconv zlib pcre libuuid ] + ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ] ++ stdenv.lib.optional (openssl != null) openssl + ++ stdenv.lib.optional (libpsl != null) libpsl ++ stdenv.lib.optional stdenv.isDarwin perl; configureFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d07ca51bb9e..ce48c8985a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4428,7 +4428,7 @@ with pkgs; weighttp = callPackage ../tools/networking/weighttp { }; wget = callPackage ../tools/networking/wget { - inherit (perlPackages) LWP; + inherit (perlPackages) IOSocketSSL LWP; libpsl = null; };