diff options
| author | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 01:46:03 -0800 |
|---|---|---|
| committer | Rob Vermaas <rob.vermaas@gmail.com> | 2014-01-31 01:46:03 -0800 |
| commit | 18af65c09b5ddceb0da7d74e697761d072568bce (patch) | |
| tree | 4464f0417540be1c72e54728932f9dac9af0b468 /pkgs/top-level | |
| parent | 6f88cad182ab1e894ed8fe382d43744be0c55650 (diff) | |
| parent | 1e3a151d3b620304875ddbe7460b6e955221fb63 (diff) | |
| download | nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar.gz nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar.bz2 nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar.lz nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar.xz nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.tar.zst nixlib-18af65c09b5ddceb0da7d74e697761d072568bce.zip | |
Merge pull request #1584 from monocell/hhvm
HipHopVM update
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7cb9f6a53bf0..a8d2584a6ecf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2688,6 +2688,7 @@ let hiphopvm = callPackage ../development/interpreters/hiphopvm { libevent = libevent14; boost = boost149; + stdenv = overrideGCC stdenv gcc48; }; falcon = builderDefsPackage (import ../development/interpreters/falcon) { @@ -4224,6 +4225,8 @@ let glm = callPackage ../development/libraries/glm { }; + glog = callPackage ../development/libraries/glog { }; + glpk = callPackage ../development/libraries/glpk { }; glsurf = callPackage ../applications/science/math/glsurf { |