summary refs log tree commit diff
path: root/pkgs/development/compilers
diff options
context:
space:
mode:
authorPiotr Bogdan <ppbogdan@gmail.com>2017-11-09 18:58:56 +0000
committerPiotr Bogdan <ppbogdan@gmail.com>2017-11-09 18:58:56 +0000
commit4173ec1562e57a67011ec5795c9628d56b051508 (patch)
tree359c1e6a260dbde1e9c348e4f23ce53e4fa56b45 /pkgs/development/compilers
parent6acabb06b70cd7bc8615c9595e3238c6f0a97c8f (diff)
downloadnixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar.gz
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar.bz2
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar.lz
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar.xz
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.tar.zst
nixpkgs-4173ec1562e57a67011ec5795c9628d56b051508.zip
hhvm: fix build with glibc 2.26
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r--pkgs/development/compilers/hhvm/default.nix8
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix
index fa76596248e..3a37ec13758 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;