treewide: Make all the rest of configureFlags

2018-08-03 17:06:03 -04:00
parent f92ed87372
commit f0d6b385d1
19 changed files with 49 additions and 30 deletions
@@ -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";