diff options
| author | Domen Kožar <domen@dev.si> | 2014-12-12 17:05:08 +0100 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2014-12-12 17:09:48 +0100 |
| commit | b7eba773dc636fc0892753b11c941dae85ddf390 (patch) | |
| tree | eaf166011b1353a1d4f15019a0219bc12c3a9ff8 /pkgs/development/compilers | |
| parent | 86055e2f0071a4c865561b2ff26081c31145894b (diff) | |
| download | nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar.gz nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar.bz2 nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar.lz nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar.xz nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.tar.zst nixlib-b7eba773dc636fc0892753b11c941dae85ddf390.zip | |
hhvm: 3.2.0 -> 3.3.0, fix build
(cherry picked from commit 9d0d9ae9f7ea940ea63dfe019c2818edd6fc376a) Signed-off-by: Domen Kožar <domen@dev.si>
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/hhvm/default.nix | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index c48e6d5a81e1..e7237d9059c5 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,22 +2,23 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype +, libxslt, ocaml, freetype, gdb }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.2.0"; + version = "3.3.0"; + # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; - sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; + rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; + sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; fetchSubmodules = true; }; buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb 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 @@ -34,7 +35,7 @@ stdenv.mkDerivation rec { # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; - patchPhase = '' + prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} substituteInPlace ./configure \ |