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

lighttpd: Fix building with magnet support.

Browse Source 
Doesn't build with LUA 5.2, so lets explicitly set LUA 5.1 as a
dependency.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
This commit is contained in:
aszlig 2015-01-13 08:36:34 +01:00
parent 6aaa655e9a
commit c5354fafce
No known key found for this signature in database
GPG Key ID: D0EBD0EC8C2DC961
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,9 +1,9 @@
{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file { stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, attr, bzip2, which, file
, openssl, enableMagnet ? false, lua5 ? null , openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, mysql ? null , enableMysql ? false, mysql ? null
}: }:
assert enableMagnet -> lua5 != null; assert enableMagnet -> lua5_1 != null;
assert enableMysql -> mysql != null; assert enableMysql -> mysql != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
}; };
buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ] buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5 ++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql; ++ stdenv.lib.optional enableMysql mysql;
configureFlags = [ "--with-openssl" ] configureFlags = [ "--with-openssl" ]