diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-01 23:38:06 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-10-01 23:38:06 +0300 |
commit | 5bf5de58ea568b733d7399233f4d661f911c742d (patch) | |
tree | eb0614162926a8e103a59e87284d759139c8aed7 /pkgs/tools/networking | |
parent | c61cc2d56cb1f790c1921c18deaf6d6c33d5627f (diff) | |
download | nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar.gz nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar.bz2 nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar.lz nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar.xz nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.tar.zst nixlib-5bf5de58ea568b733d7399233f4d661f911c742d.zip |
treewide: Fix 'lib.optional' misuses
These add a singleton list of a package to buildInputs.
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/openssh/default.nix | 2 | ||||
-rw-r--r-- | pkgs/tools/networking/swec/default.nix | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index a6e4b7c4c209..0c19822d37c9 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ++ optional withGssapiPatches gssapiSrc; buildInputs = [ zlib openssl libedit pkgconfig pam ] - ++ optional withKerberos [ kerberos ]; + ++ optional withKerberos kerberos; # I set --disable-strip because later we strip anyway. And it fails to strip # properly when cross building. diff --git a/pkgs/tools/networking/swec/default.nix b/pkgs/tools/networking/swec/default.nix index 851af6f24f6f..5b7f8f114df3 100644 --- a/pkgs/tools/networking/swec/default.nix +++ b/pkgs/tools/networking/swec/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper perl LWP URI HTMLParser ] - ++ stdenv.lib.optional doCheck [ HTTPServerSimple Parent ]; + ++ stdenv.lib.optionals doCheck [ HTTPServerSimple Parent ]; configurePhase = '' for i in swec tests/{runTests,testServer} |