diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-11-09 20:28:48 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-11-09 22:22:34 +0100 |
| commit | fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0 (patch) | |
| tree | 85b6ad460f6df36df3337d44e12b0fc9b2b6301f /pkgs/development | |
| parent | 9f4024c05d57f93324762850961865cbb231680e (diff) | |
| parent | 4173ec1562e57a67011ec5795c9628d56b051508 (diff) | |
| download | nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar.gz nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar.bz2 nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar.lz nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar.xz nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.tar.zst nixlib-fb00ed80e4a8153d8b8a6518d7db10ecda4b6fa0.zip | |
Merge #31449: hhvm: fix build with glibc-2.26
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/compilers/hhvm/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index fa76596248ee..3a37ec137580 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -1,5 +1,5 @@ -{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, libmemcached, pcre -, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php +{ stdenv, fetchgit, fetchurl, cmake, pkgconfig, boost, libunwind, libmemcached +, pcre, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, libkrb5 , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , libxslt, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit @@ -29,6 +29,10 @@ stdenv.mkDerivation rec { patches = [ ./flexible-array-members-gcc6.patch + (fetchurl { + url = https://github.com/facebook/hhvm/commit/b506902af2b7c53de6d6c92491c2086472292004.patch; + sha256 = "1br7diczqks6b1xjrdsac599fc62m9l17gcx7dvkc0qj54lq7ys4"; + }) ]; enableParallelBuilding = false; # occasional build problems; |