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

wget: add some more dependencies & small cleanups

Browse Source 
cc #22416
This commit is contained in:
Franz Pletz 2017-02-06 13:16:44 +01:00
parent 8b9e2010b4
commit 900326fdc0
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/tools/networking/wget/default.nix
View File

@ -1,6 +1,8 @@
{ stdenv, fetchurl, gettext, libidn2, pkgconfig { stdenv, fetchurl, gettext, pkgconfig, perl
, perl, perlPackages, LWP, python3 , libidn2, zlib, pcre, libuuid, libiconv
, libiconv, libpsl ? null, openssl ? null }: , IOSocketSSL, LWP, python3
, libpsl ? null
, openssl ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "wget-1.19"; name = "wget-1.19";
@ -26,9 +28,10 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ gettext pkgconfig perl ]; nativeBuildInputs = [ gettext pkgconfig perl ];
buildInputs = [ libidn2 libiconv libpsl ] buildInputs = [ libidn2 libiconv zlib pcre libuuid ]
++ stdenv.lib.optionals doCheck [ perlPackages.IOSocketSSL LWP python3 ] ++ stdenv.lib.optionals doCheck [ IOSocketSSL LWP python3 ]
++ stdenv.lib.optional (openssl != null) openssl ++ stdenv.lib.optional (openssl != null) openssl
++ stdenv.lib.optional (libpsl != null) libpsl
++ stdenv.lib.optional stdenv.isDarwin perl; ++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags = configureFlags =

2
pkgs/top-level/all-packages.nix
View File

@ -4428,7 +4428,7 @@ with pkgs;
weighttp = callPackage ../tools/networking/weighttp { }; weighttp = callPackage ../tools/networking/weighttp { };
wget = callPackage ../tools/networking/wget { wget = callPackage ../tools/networking/wget {
inherit (perlPackages) LWP; inherit (perlPackages) IOSocketSSL LWP;
libpsl = null; libpsl = null;
}; };