From 580cab57e4f188d25144e398d7b8e3d5085299a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Hedin=20Br=C3=B8nner?= Date: Sun, 12 Aug 2018 10:08:46 +0200 Subject: [PATCH] wget, fwknop: fixup after configureFlags refactoring --- pkgs/tools/networking/wget/default.nix | 4 ++-- pkgs/tools/security/fwknop/default.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index cd1801318a6..0bd99c63596 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (libpsl != null) libpsl ++ stdenv.lib.optional stdenv.isDarwin perl; - configureFlags = [ - (stdenv.lib.withFeatureAs (openssl != null) "ssl" openssl) + configureFlags = [ + (stdenv.lib.withFeatureAs (openssl != null) "ssl" "openssl") ]; doCheck = false; diff --git a/pkgs/tools/security/fwknop/default.nix b/pkgs/tools/security/fwknop/default.nix index a8fc864afd6..812c032230c 100644 --- a/pkgs/tools/security/fwknop/default.nix +++ b/pkgs/tools/security/fwknop/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "--with-iptables=${iptables}/sbin/iptables" (stdenv.lib.enableFeature buildServer "server") (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 [ "--with-gpgme" "--with-gpgme-prefix=${gpgme.dev}"