diff options
author | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:32 +0100 |
---|---|---|
committer | Luca Bruno <lucabru@src.gnome.org> | 2014-11-08 15:56:40 +0100 |
commit | 83221f3886c8b74f78edbad5a1541de0837a0f24 (patch) | |
tree | f9a53d659e562acf0637ffb42f013aebf460a947 /pkgs/applications/version-management/subversion | |
parent | 7f3c95e6b7d40df043652b2fca54b0997e7a1937 (diff) | |
parent | aa2fd47e9dee4e36e4bd494601e0ae5d9b40a78f (diff) | |
download | nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.gz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.bz2 nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.lz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.xz nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.tar.zst nixlib-83221f3886c8b74f78edbad5a1541de0837a0f24.zip |
Merge branch 'master' into staging
Makes the build more useful: - Disabled hybrid iso, makes installer tests pass again - Imagemagick fixes to the "Illegal instruction" thing
Diffstat (limited to 'pkgs/applications/version-management/subversion')
-rw-r--r-- | pkgs/applications/version-management/subversion/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index ff19b0af16f4..1ec4866f1aa4 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -6,12 +6,12 @@ , javahlBindings ? false , saslSupport ? false , stdenv, fetchurl, apr, aprutil, zlib, sqlite -, httpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null +, apacheHttpd ? null, expat, swig ? null, jdk ? null, python ? null, perl ? null , sasl ? null, serf ? null }: assert bdbSupport -> aprutil.bdbSupport; -assert httpServer -> httpd != null; +assert httpServer -> apacheHttpd != null; assert pythonBindings -> swig != null && python != null; assert javahlBindings -> jdk != null && perl != null; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { configureFlags = '' ${if bdbSupport then "--with-berkeley-db" else "--without-berkeley-db"} - ${if httpServer then "--with-apxs=${httpd}/bin/apxs" else "--without-apxs"} + ${if httpServer then "--with-apxs=${apacheHttpd}/bin/apxs" else "--without-apxs"} ${if pythonBindings || perlBindings then "--with-swig=${swig}" else "--without-swig"} ${if javahlBindings then "--enable-javahl --with-jdk=${jdk}" else ""} ${if stdenv.isDarwin then "--enable-keychain" else "--disable-keychain"} |