mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge #31449: hhvm: fix build with glibc-2.26
This commit is contained in:
commit
fb00ed80e4
@ -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;
|
||||
|
Loading…
Reference in New Issue
Block a user