From 4173ec1562e57a67011ec5795c9628d56b051508 Mon Sep 17 00:00:00 2001 From: Piotr Bogdan Date: Thu, 9 Nov 2017 18:58:56 +0000 Subject: hhvm: fix build with glibc 2.26 --- pkgs/development/compilers/hhvm/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'pkgs/development') 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; -- cgit 1.4.1