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

nixpkgs: hhvm 3.3.0 -> 3.6.0

Browse Source 
- We need {perl,git,krb5,libvpx,etc} as a dependency
  - Drop upstream patches.
  - Simplify build (uses cmake configuration)
  - Simplify install (uses cmake generated installer)

Signed-off-by: Austin Seipp <aseipp@pobox.com>
This commit is contained in:
Austin Seipp 2015-03-17 19:32:10 -05:00
parent 224d0d5302
commit 1ef6f44e5d
1 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
pkgs/development/compilers/hhvm/default.nix
View File

@ -1,39 +1,34 @@
{ stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, mariadb, libmemcached, pcre { stdenv, fetchgit, cmake, pkgconfig, boost, libunwind, 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, tbb, gperftools, glog , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog, krb5
, bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng
, libxslt, ocaml, freetype, gdb , libxslt, ocaml, freetype, gdb, git, perl, mariadb, gmp, libyaml, libedit
, libvpx, imagemagick, fribidi
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "hhvm-${version}"; name = "hhvm-${version}";
version = "3.3.0"; version = "3.6.0";
# use git version since we need submodules # 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 = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; rev = "6ef13f20da20993dc8bab9eb103f73568618d3e8";
sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; sha256 = "29a2d4b56cfd348b199d8f90b4e4b07de85dfb2ef1538479cd1e84f5bc1fbf96";
fetchSubmodules = true; fetchSubmodules = true;
}; };
patches = [
./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch
./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch
];
buildInputs = buildInputs =
[ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb git perl
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 krb5
gmp libyaml libedit libvpx imagemagick fribidi
]; ];
enableParallelBuilding = true; enableParallelBuilding = true;
dontUseCmakeBuildDir = true; dontUseCmakeBuildDir = true;
dontUseCmakeConfigure = true;
NIX_LDFLAGS = "-lpam -L${pam}/lib"; NIX_LDFLAGS = "-lpam -L${pam}/lib";
USE_HHVM=1;
MYSQL_INCLUDE_DIR="${mariadb}/include/mysql"; MYSQL_INCLUDE_DIR="${mariadb}/include/mysql";
MYSQL_DIR=mariadb; MYSQL_DIR=mariadb;
@ -46,19 +41,8 @@ stdenv.mkDerivation rec {
substituteInPlace ./configure \ substituteInPlace ./configure \
--replace "/usr/bin/env bash" ${stdenv.shell} --replace "/usr/bin/env bash" ${stdenv.shell}
''; '';
installPhase = ''
mkdir -p $out/bin $out/lib
mv hphp/hhvm/hhvm $out/bin
mv hphp/hack/bin/hh_server $out/bin
mv hphp/hack/bin/hh_client $out/bin
mv hphp/hack/hhi $out/lib/hack-hhi
cat > $out/bin/hhvm-hhi-copy <<EOF cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" ];
#!${stdenv.shell}
cp -R $out/lib/hack-hhi \$1
EOF
chmod +x $out/bin/hhvm-hhi-copy
'';
meta = { meta = {
description = "High-performance JIT compiler for PHP/Hack"; description = "High-performance JIT compiler for PHP/Hack";