* Subversion 1.4.0. Note: Subversion 1.4 upgrades your working

  copies, so it's hard to go back to 1.3.

svn path=/nixpkgs/trunk/; revision=6486

1 files changed, 17 insertions, 5 deletions

diff --git a/pkgs/development/libraries/neon/default.nix b/pkgs/development/libraries/neon/default.nix
index 3cc061cd42b..0a75efa56ae 100644
--- a/pkgs/development/libraries/neon/default.nix
+++ b/pkgs/development/libraries/neon/default.nix
@@ -1,12 +1,24 @@
-{stdenv, fetchurl, libxml2}:
+{ stdenv, fetchurl, libxml2
+, compressionSupport ? true, zlib ? null
+, sslSupport ? true, openssl ? null
+}:
 
-stdenv.mkDerivation {
+assert compressionSupport -> zlib != null;
+assert sslSupport -> openssl != null;
+
+(stdenv.mkDerivation {
   name = "neon-0.25.5";
+  
   src = fetchurl {
     url = http://www.webdav.org/neon/neon-0.25.5.tar.gz;
     md5 = "b5fdb71dd407f0a3de0f267d27c9ab17";
   };
-  buildInputs = [libxml2];
+  
+  buildInputs = [libxml2] ++ (if compressionSupport then [zlib] else []);
 
-  configureFlags="--enable-shared";
-}
+  configureFlags="
+    --enable-shared --disable-static
+    ${if compressionSupport then "--with-zlib" else "--without-zlib"}
+    ${if sslSupport then "--with-ssl --with-libs=${openssl}" else "--without-ssl"}
+  ";
+}) // {inherit compressionSupport sslSupport;}