diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-07-25 17:44:21 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-08-03 17:06:03 -0400 |
| commit | 85a9913edd50b7ea9b4dfbaedd5d40a739b97d3e (patch) | |
| tree | 544a86c87280e6870fefe3005d2b9387a6b48581 /pkgs/applications/version-management/subversion | |
| parent | 632d24f11f51cc1581e921aa0eb8c6669296e8de (diff) | |
treewide: Make more complicated configureFlags lists
Diffstat (limited to 'pkgs/applications/version-management/subversion')
| -rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 24 |
1 files changed, 13 insertions, 11 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index fc98b398213c..f5bdb0ae62a0 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -42,17 +42,19 @@ let # https://gcc.gnu.org/gcc-5/porting_to.html CPPFLAGS = "-P"; - configureFlags = '' - ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${apacheHttpd.dev}/bin/apxs" else "--without-apxs"} - ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} - ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} - --disable-keychain - ${if saslSupport then "--with-sasl=${sasl}" else "--without-sasl"} - ${if httpSupport then "--with-serf=${serf}" else "--without-serf"} - --with-zlib=${zlib.dev} - --with-sqlite=${sqlite.dev} - ''; + configureFlags = [ + (stdenv.lib.withFeature bdbSupport "berkeley-db") + (stdenv.lib.withFeatureAs httpServer "apxs" "${apacheHttpd.dev}/bin/apxs") + (stdenv.lib.withFeatureAs (pythonBindings || perlBindings) "swig" swig) + (stdenv.lib.withFeatureAs saslSupport "sasl" sasl) + (stdenv.lib.withFeatureAs httpSupport "serf" serf) + "--disable-keychain" + "--with-zlib=${zlib.dev}" + "--with-sqlite=${sqlite.dev}" + ] ++ stdenv.lib.optionals javahlBindings [ + "--enable-javahl" + "--with-jdk=${jdk}" + ]; preBuild = '' makeFlagsArray=(APACHE_LIBEXECDIR=$out/modules) |