diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-08-01 17:46:30 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-08-07 20:46:37 +0200 |
commit | 950feb70b2e43e300bd0f285eb6e3ad446ca0722 (patch) | |
tree | f245993b24df468364c224dc9f3a3b29cb2539f4 /pkgs/development/compilers/hhvm/default.nix | |
parent | 9a072482e69ab90c09ce2ca464a4316fb07c4a45 (diff) | |
download | nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.gz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.bz2 nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.lz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.xz nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.tar.zst nixlib-950feb70b2e43e300bd0f285eb6e3ad446ca0722.zip |
treewide: fixup various mysql ocurrences after re-split
Diffstat (limited to 'pkgs/development/compilers/hhvm/default.nix')
-rw-r--r-- | pkgs/development/compilers/hhvm/default.nix | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index 59fb90d78cdf..ef4aa44d436a 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl + [ cmake pkgconfig boost libunwind mariadb.client libmemcached pcre gdb git perl libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libkrb5 @@ -29,8 +29,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; # occasional build problems; dontUseCmakeBuildDir = true; NIX_LDFLAGS = "-lpam -L${pam}/lib"; - MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; - MYSQL_DIR=mariadb; # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype.dev}/include/freetype2"; |