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

Merge pull request #61128 from deadloko/fix/LighttpdCrossCompilation

Browse Source 
lighttpd: fix crosscompilation
This commit is contained in:
Matthew Bauer 2019-05-09 13:11:25 -04:00 committed by GitHub
commit 4dce6bc461
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
{ stdenv, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
{ stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file
, openssl, enableMagnet ? false, lua5_1 ? null
, enableMysql ? false, mysql ? null
, enableLdap ? false, openldap ? null
@ -28,8 +28,10 @@ stdenv.mkDerivation rec {
sed -ire '/[$]self->{HOSTNAME} *=/i if(length($name)==0) { $name = "127.0.0.1" }' tests/LightyTest.pm
'';
depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ pcre libxml2 zlib bzip2 which file openssl ]
buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ]
++ stdenv.lib.optional enableMagnet lua5_1
++ stdenv.lib.optional enableMysql mysql.connector-c
++ stdenv.lib.optional enableLdap openldap
@ -45,6 +47,7 @@ stdenv.mkDerivation rec {
++ stdenv.lib.optional enableExtendedAttrs "--with-attr";
preConfigure = ''
export PATH=$PATH:${pcre.dev}/bin
sed -i "s:/usr/bin/file:${file}/bin/file:g" configure
'';