diff options
| author | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2019-09-21 13:14:09 +0200 |
| commit | 41af38f3728bd64b80721c44ed1fb019978cbc1b (patch) | |
| tree | f95e41e3f80b5f9f1f5a6c3462b6352a12575c40 /pkgs/servers/http | |
| parent | f0fec244ca380b9d3e617ee7b419c59758c8b0f1 (diff) | |
| parent | 22d7eb74d9b554fe6a18e6542ff85bc38f0bc923 (diff) | |
| download | nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.gz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.bz2 nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.lz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.xz nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.tar.zst nixpkgs-41af38f3728bd64b80721c44ed1fb019978cbc1b.zip | |
Merge branch 'staging-next'
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/lighttpd/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 7dacb997d47..f67bc5b0045 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -1,6 +1,6 @@ { stdenv, buildPackages, fetchurl, pkgconfig, pcre, libxml2, zlib, bzip2, which, file , openssl, enableMagnet ? false, lua5_1 ? null -, enableMysql ? false, mysql ? null +, enableMysql ? false, libmysqlclient ? null , enableLdap ? false, openldap ? null , enableWebDAV ? false, sqlite ? null, libuuid ? null , enableExtendedAttrs ? false, attr ? null @@ -8,7 +8,7 @@ }: assert enableMagnet -> lua5_1 != null; -assert enableMysql -> mysql != null; +assert enableMysql -> libmysqlclient != null; assert enableLdap -> openldap != null; assert enableWebDAV -> sqlite != null; assert enableWebDAV -> libuuid != null; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; 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 enableMysql libmysqlclient ++ stdenv.lib.optional enableLdap openldap ++ stdenv.lib.optional enableWebDAV sqlite ++ stdenv.lib.optional enableWebDAV libuuid; |