diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 12:52:40 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
commit | f0d6b385d12600ab307ab205c166c993d3588087 (patch) | |
tree | fc915e69eb5a80b27e17214d285110283fcccf18 /pkgs/applications/networking | |
parent | f92ed87372042fa2ee4c2048ae47c511c9285a1b (diff) |
treewide: Make all the rest of configureFlags
Diffstat (limited to 'pkgs/applications/networking')
-rw-r--r-- | pkgs/applications/networking/browsers/dillo/default.nix | 2 | ||||
-rw-r--r-- | pkgs/applications/networking/znc/default.nix | 11 |
2 files changed, 8 insertions, 5 deletions
diff --git a/pkgs/applications/networking/browsers/dillo/default.nix b/pkgs/applications/networking/browsers/dillo/default.nix index 73094767bf3d6..ab1e0822bf1a9 100644 --- a/pkgs/applications/networking/browsers/dillo/default.nix +++ b/pkgs/applications/networking/browsers/dillo/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ perl fltk openssl libjpeg libpng libXcursor libXi libXinerama ]; - configureFlags = "--enable-ssl"; + configureFlags = [ "--enable-ssl" ]; meta = with stdenv.lib; { homepage = https://www.dillo.org/; diff --git a/pkgs/applications/networking/znc/default.nix b/pkgs/applications/networking/znc/default.nix index 30fa41de12d19..ca5624d5b73f6 100644 --- a/pkgs/applications/networking/znc/default.nix +++ b/pkgs/applications/networking/znc/default.nix @@ -24,10 +24,13 @@ stdenv.mkDerivation rec { ++ optional withTcl tcl ++ optional withCyrus cyrus_sasl; - configureFlags = optionalString withPerl "--enable-perl " - + optionalString withPython "--enable-python " - + optionalString withTcl "--enable-tcl --with-tcl=${tcl}/lib " - + optionalString withCyrus "--enable-cyrus "; + configureFlags = [ + (stdenv.lib.enableFeature withPerl "perl") + (stdenv.lib.enableFeature withPython "python") + (stdenv.lib.enableFeature withTcl "tcl") + (stdenv.lib.withFeatureAs withTcl "tcl" "${tcl}/lib") + (stdenv.lib.enableFeature withCyrus "cyrus") + ]; meta = with stdenv.lib; { description = "Advanced IRC bouncer"; |