Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

1 files changed, 11 insertions, 6 deletions

diff --git a/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
index cdebbf739e6a..db459dc81c8e 100644
--- a/nixpkgs/pkgs/servers/http/lighttpd/default.nix
+++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix
@@ -1,8 +1,9 @@
-{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
+{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
 , openssl, enableMagnet ? false, lua5_1 ? null
 , enableMysql ? false, mysql ? null
 , enableLdap ? false, openldap ? null
-, enableWebDAV ? true, sqlite ? null, libuuid ? null
+, enableWebDAV ? false, sqlite ? null, libuuid ? null
+, enableExtendedAttrs ? false, attr ? null
 , perl
 }:
 
@@ -11,6 +12,7 @@ assert enableMysql -> mysql != null;
 assert enableLdap -> openldap != null;
 assert enableWebDAV -> sqlite != null;
 assert enableWebDAV -> libuuid != null;
+assert enableExtendedAttrs -> attr != null;
 
 stdenv.mkDerivation rec {
   name = "lighttpd-1.4.52";
@@ -22,10 +24,12 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs tests
+    # Linux sandbox has an empty hostname and not /etc/hosts, which fails some tests
+    sed -ire '/[$]self->{HOSTNAME} *=/i     if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm
   '';
 
   nativeBuildInputs = [ pkgconfig ];
-  buildInputs = [ pcre libxml2 zlib attr bzip2 which file openssl ]
+  buildInputs = [ pcre libxml2 zlib bzip2 which file openssl ]
              ++ stdenv.lib.optional enableMagnet lua5_1
              ++ stdenv.lib.optional enableMysql mysql.connector-c
              ++ stdenv.lib.optional enableLdap openldap
@@ -37,14 +41,15 @@ stdenv.mkDerivation rec {
                 ++ stdenv.lib.optional enableMysql "--with-mysql"
                 ++ stdenv.lib.optional enableLdap "--with-ldap"
                 ++ stdenv.lib.optional enableWebDAV "--with-webdav-props"
-                ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks";
+                ++ stdenv.lib.optional enableWebDAV "--with-webdav-locks"
+                ++ stdenv.lib.optional enableExtendedAttrs "--with-attr";
 
   preConfigure = ''
     sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
   '';
 
   checkInputs = [ perl ];
-  doCheck = false; # fails 2 tests
+  doCheck = true;
 
   postInstall = ''
     mkdir -p "$out/share/lighttpd/doc/config"
@@ -59,7 +64,7 @@ stdenv.mkDerivation rec {
     description = "Lightweight high-performance web server";
     homepage = http://www.lighttpd.net/;
     license = stdenv.lib.licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = platforms.linux ++ platforms.darwin;
     maintainers = [ maintainers.bjornfor ];
   };
 }