public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #53488 from kirelagin/lighttpd-darwin

Browse Source 
lighttpd: Unbreak on darwin, enable tests
This commit is contained in:
Arseniy Seroka 2019-01-06 13:34:46 +03:00 committed by GitHub
commit 5489e49ebb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/servers/http/lighttpd/default.nix
View File

@ -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 , openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, mysql ? null , enableMysql ? false, mysql ? null
, enableLdap ? false, openldap ? null , enableLdap ? false, openldap ? null
, enableWebDAV ? true, sqlite ? null, libuuid ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null
, enableExtendedAttrs ? false, attr ? null
, perl , perl
}: }:
@ -11,6 +12,7 @@ assert enableMysql -> mysql != null;
assert enableLdap -> openldap != null; assert enableLdap -> openldap != null;
assert enableWebDAV -> sqlite != null; assert enableWebDAV -> sqlite != null;
assert enableWebDAV -> libuuid != null; assert enableWebDAV -> libuuid != null;
assert enableExtendedAttrs -> attr != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "lighttpd-1.4.52"; name = "lighttpd-1.4.52";
@ -25,7 +27,7 @@ stdenv.mkDerivation rec {
''; '';
nativeBuildInputs = [ pkgconfig ]; 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 enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql.connector-c ++ stdenv.lib.optional enableMysql mysql.connector-c
++ stdenv.lib.optional enableLdap openldap ++ stdenv.lib.optional enableLdap openldap
@ -37,14 +39,15 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableMysql "--with-mysql" ++ stdenv.lib.optional enableMysql "--with-mysql"
++ stdenv.lib.optional enableLdap "--with-ldap" ++ stdenv.lib.optional enableLdap "--with-ldap"
++ stdenv.lib.optional enableWebDAV "--with-webdav-props" ++ 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 = '' preConfigure = ''
sed -i "s:/usr/bin/file:${file}/bin/file:g" configure sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
''; '';
checkInputs = [ perl ]; checkInputs = [ perl ];
doCheck = false; # fails 2 tests doCheck = true;
postInstall = '' postInstall = ''
mkdir -p "$out/share/lighttpd/doc/config" mkdir -p "$out/share/lighttpd/doc/config"
@ -59,7 +62,7 @@ stdenv.mkDerivation rec {
description = "Lightweight high-performance web server"; description = "Lightweight high-performance web server";
homepage = http://www.lighttpd.net/; homepage = http://www.lighttpd.net/;
license = stdenv.lib.licenses.bsd3; license = stdenv.lib.licenses.bsd3;
platforms = platforms.linux; platforms = platforms.linux ++ platforms.darwin;
maintainers = [ maintainers.bjornfor ]; maintainers = [ maintainers.bjornfor ];
}; };
} }