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

wget, fwknop: fixup after configureFlags refactoring

Browse Source
This commit is contained in:
Tor Hedin Brønner 2018-08-12 10:08:46 +02:00 committed by Vladimír Čunát
parent 7b3036a4a2
commit 580cab57e4
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,8 +34,8 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional (libpsl != null) libpsl ++ stdenv.lib.optional (libpsl != null) libpsl
++ stdenv.lib.optional stdenv.isDarwin perl; ++ stdenv.lib.optional stdenv.isDarwin perl;
configureFlags = [ configureFlags = [
(stdenv.lib.withFeatureAs (openssl != null) "ssl" openssl) (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl")
]; ];
doCheck = false; doCheck = false;

2
pkgs/tools/security/fwknop/default.nix
View File

@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
"--with-iptables=${iptables}/sbin/iptables" "--with-iptables=${iptables}/sbin/iptables"
(stdenv.lib.enableFeature buildServer "server") (stdenv.lib.enableFeature buildServer "server")
(stdenv.lib.enableFeature buildClient "client") (stdenv.lib.enableFeature buildClient "client")
(stdenv.lib.withFeatureAs wgetSupport wget "${wget}/bin/wget") (stdenv.lib.withFeatureAs wgetSupport "wget" "${wget}/bin/wget")
] ++ stdenv.lib.optionalString gnupgSupport [ ] ++ stdenv.lib.optionalString gnupgSupport [
"--with-gpgme" "--with-gpgme"
"--with-gpgme-prefix=${gpgme.dev}" "--with-gpgme-prefix=${gpgme.dev}"