alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

hhvm: 3.2.0 -> 3.3.0, fix build

Browse source
This commit is contained in:
Domen Kožar 2014-12-12 17:05:08 +01:00
parent 6c406b9425
commit 9d0d9ae9f7
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/development/compilers/hhvm/default.nix
View file

@ -2,22 +2,23 @@
, libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c
, expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, ocaml, freetype , libxslt, ocaml, freetype, gdb
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hhvm-${version}"; name = "hhvm-${version}";
version = "3.2.0"; version = "3.3.0";
# use git version since we need submodules
src = fetchgit { src = fetchgit {
url = "https://github.com/facebook/hhvm.git"; url = "https://github.com/facebook/hhvm.git";
rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268";
sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9";
fetchSubmodules = true; fetchSubmodules = true;
}; };
buildInputs = 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 libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap
oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml
@ -34,7 +35,7 @@ stdenv.mkDerivation rec {
# work around broken build system # work around broken build system
NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2";
patchPhase = '' prePatch = ''
substituteInPlace hphp/util/generate-buildinfo.sh \ substituteInPlace hphp/util/generate-buildinfo.sh \
--replace /bin/bash ${stdenv.shell} --replace /bin/bash ${stdenv.shell}
substituteInPlace ./configure \ substituteInPlace ./configure \