wget: remove ? null from inputs

This commit is contained in:
Sandro Jäckel 2022-07-29 23:07:44 +02:00
parent 0cd4230400
commit f483774264
No known key found for this signature in database
GPG key ID: 3AF5A43A3EECC2E5
2 changed files with 7 additions and 12 deletions

View file

@ -1,8 +1,9 @@
{ lib, stdenv, fetchurl, gettext, pkg-config, perlPackages
, libidn2, zlib, pcre, libuuid, libiconv, libintl
, python3, lzip
, libpsl ? null
, openssl ? null }:
, withLibpsl ? false, libpsl
, withOpenssl ? true, openssl
}:
stdenv.mkDerivation rec {
pname = "wget";
@ -31,12 +32,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ gettext pkg-config perlPackages.perl lzip libiconv libintl ];
buildInputs = [ libidn2 zlib pcre libuuid ]
++ lib.optionals doCheck [ perlPackages.IOSocketSSL perlPackages.LWP python3 ]
++ lib.optional (openssl != null) openssl
++ lib.optional (libpsl != null) libpsl
++ lib.optional withOpenssl openssl
++ lib.optional withLibpsl libpsl
++ lib.optional stdenv.isDarwin perlPackages.perl;
configureFlags = [
(lib.withFeatureAs (openssl != null) "ssl" "openssl")
(lib.withFeatureAs withOpenssl "ssl" "openssl")
] ++ lib.optionals stdenv.isDarwin [
# https://lists.gnu.org/archive/html/bug-wget/2021-01/msg00076.html
"--without-included-regex"
@ -46,18 +47,14 @@ stdenv.mkDerivation rec {
meta = with lib; {
description = "Tool for retrieving files using HTTP, HTTPS, and FTP";
longDescription =
'' GNU Wget is a free software package for retrieving files using HTTP,
HTTPS and FTP, the most widely-used Internet protocols. It is a
non-interactive commandline tool, so it may easily be called from
scripts, cron jobs, terminals without X-Windows support, etc.
'';
license = licenses.gpl3Plus;
homepage = "https://www.gnu.org/software/wget/";
maintainers = with maintainers; [ fpletz ];
platforms = platforms.all;
};

View file

@ -12073,9 +12073,7 @@ with pkgs;
webalizer = callPackage ../tools/networking/webalizer { };
wget = callPackage ../tools/networking/wget {
libpsl = null;
};
wget = callPackage ../tools/networking/wget { };
wget2 = callPackage ../tools/networking/wget2 {
# update breaks grub2