JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1584 from monocell/hhvm

Browse Source 
HipHopVM update
This commit is contained in:
Rob Vermaas 2014-01-31 01:46:03 -08:00
commit 18af65c09b
3 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
pkgs/development/interpreters/hiphopvm/default.nix
View File

@ -1,14 +1,14 @@
{ stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre { stdenv, fetchurl, fetchgit, cmake, boost, libunwind, mysql, libmemcached, pcre
, 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, inteltbb, gperftools , expat, libcap, oniguruma, libdwarf, libmcrypt, inteltbb, gperftools, glog
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
}: }:
assert stdenv.system == "x86_64-linux"; assert stdenv.system == "x86_64-linux";
let let
src = fetchgit { src = fetchgit {
url = "git://github.com/facebook/hiphop-php.git"; url = "git://github.com/facebook/hiphop-php.git";
rev = "73f1c0ebd9b313f6b3baecd8c8046e0b595b1157"; rev = "1e23dec9f0b1ce8aaa5833d0527a369c8e254ffd";
sha256 = "104133c6054bc9ab0288eaa0cea168b6699e537b3ea76ecdc38ee833d93dca09"; sha256 = "0fblwgq8c3hmamw0m5d1mn8qhyqf14v2zf62cgrkvmbiz6jlrbr6";
}; };
libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec { libxml2_280 = stdenv.lib.overrideDerivation libxml2 (args: rec {
@ -21,37 +21,35 @@ let
patches = []; patches = [];
}); });
curlFB = stdenv.lib.overrideDerivation curl (args: { patches = [ "${src}/src/third_party/libcurl-7.22.1.fb-changes.diff" ]; });
fbPatch = "${src}/src/third_party/libevent-1.4.14.fb-changes.diff"; fbPatch = "${src}/hphp/third_party/libevent-1.4.14.fb-changes.diff";
libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; }); libeventFB = stdenv.lib.overrideDerivation libevent (args: { patches = [fbPatch]; });
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "hiphop-php-73f1c0ebd9"; name = "hiphop-php-1e23dec9f0";
inherit src; inherit src;
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
dontUseCmakeConfigure = true; dontUseCmakeConfigure = true;
USE_HHVM=1; USE_HHVM=1;
preConfigure = '' preConfigure = ''
export HPHP_HOME=$PWD
export HPHP_LIB=$PWD/bin export HPHP_LIB=$PWD/bin
export TBB_INSTALL_DIR=${inteltbb} export TBB_INSTALL_DIR=${inteltbb}
export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21" export TBB_ARCH_PLATFORM="intel64/cc4.1.0_libc2.4_kernel2.6.16.21"
sed -i 's| DEPRECATED | DEPRECATED_ |' src/runtime/base/runtime_error.h sed 's=/bin/bash=/${stdenv.shell}=g' -i hphp/util/generate-buildinfo.sh
''; '';
NIX_LDFLAGS = "-lpam -L${pam}/lib"; NIX_LDFLAGS = "-lpam -L${pam}/lib";
MYSQL_INCLUDE_DIR="${mysql}/include/mysql";
MYSQL_DIR=mysql; MYSQL_DIR=mysql;
buildInputs = [ buildInputs = [
cmake boost libunwind mysql libmemcached pcre libeventFB gd curlFB cmake boost libunwind mysql libmemcached pcre libeventFB gd curl
libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma libxml2_280 icu flex bison openssl zlib php expat libcap oniguruma
libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline libdwarf libmcrypt inteltbb gperftools bzip2 openldap readline
libelf uwimap binutils cyrus_sasl pam libelf uwimap binutils cyrus_sasl pam glog libpng
]; ];
installPhase = '' installPhase = ''
mkdir -p $out/bin mkdir -p $out/bin
cp src/hhvm/hhvm $out/bin cp hphp/hhvm/hhvm $out/bin
cp bin/systemlib.php $out/bin
''; '';
patches = [./tbb.patch]; patches = [./tbb.patch];

16
pkgs/development/libraries/glog/default.nix Normal file
View File

@ -0,0 +1,16 @@
{ stdenv, fetchurl }:
stdenv.mkDerivation rec {
name = "glog-0.3.3";
src = fetchurl {
url = "http://google-glog.googlecode.com/files/${name}.tar.gz";
sha1 = "ed40c26ecffc5ad47c618684415799ebaaa30d65";
};
meta = {
homepage = http://code.google.com/p/google-glog/;
license = "BSD";
description = "The glog library implements application-level logging.";
};
}

3
pkgs/top-level/all-packages.nix
View File

@ -2688,6 +2688,7 @@ let
hiphopvm = callPackage ../development/interpreters/hiphopvm { hiphopvm = callPackage ../development/interpreters/hiphopvm {
libevent = libevent14; libevent = libevent14;
boost = boost149; boost = boost149;
stdenv = overrideGCC stdenv gcc48;
}; };
falcon = builderDefsPackage (import ../development/interpreters/falcon) { falcon = builderDefsPackage (import ../development/interpreters/falcon) {
@ -4224,6 +4225,8 @@ let
glm = callPackage ../development/libraries/glm { }; glm = callPackage ../development/libraries/glm { };
glog = callPackage ../development/libraries/glog { };
glpk = callPackage ../development/libraries/glpk { }; glpk = callPackage ../development/libraries/glpk { };
glsurf = callPackage ../applications/science/math/glsurf { glsurf = callPackage ../applications/science/math/glsurf {