diff options
author | aszlig <aszlig@redmoonstudios.org> | 2014-04-21 09:50:50 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2014-04-21 09:50:50 +0200 |
commit | cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d (patch) | |
tree | 3a81976601f130f824a65fc66a6f724dbe3dd855 /pkgs/servers | |
parent | 5701e4e15aa5876e0dcfa5079f76a80d9a5afac8 (diff) | |
parent | 18234b676821db85f6d94777c90303e513f2f110 (diff) | |
download | nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.gz nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.bz2 nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.lz nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.xz nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.tar.zst nixlib-cdd1c9caa5d2a6eb184ec159bcfde3ac9745c56d.zip |
Merge branch 'chromium-refactor', closes #1798.
This implements some longstanding work of getting the Chromium derivation more modular. Unfortunately, I didn't manage to decrease the compile time, which was one of the primary goal for doing the refactor. A main reason this didn't work out well was the fact that most bundled libraries are so heavily patched that it's not possible within a limited time frame to decouple it from the main derivation. However, it should now be easier to build other derivations that build upon Chromium, like libcef. Also, it finally adds support for the non-free PepperAPI Flash and PDF plugins and support for fetching the corresponding versions through the updater.
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/nosql/mongodb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/nosql/rethinkdb/default.nix | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 6956271e992c..a5a021b93545 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, boost, v8, gperftools, pcre, snappy }: +{ stdenv, fetchurl, scons, boost, v8_3_14, gperftools, pcre, snappy }: let version = "2.4.8"; in stdenv.mkDerivation rec { name = "mongodb-${version}"; @@ -8,7 +8,7 @@ let version = "2.4.8"; in stdenv.mkDerivation rec { sha256 = "1p6gnharypglfp39halp72fig96fqjhakyy7m76a1prxwpjkqw7x"; }; - nativeBuildInputs = [ scons boost v8 gperftools pcre snappy ]; + nativeBuildInputs = [ scons boost v8_3_14 gperftools pcre snappy ]; postPatch = '' substituteInPlace SConstruct \ diff --git a/pkgs/servers/nosql/rethinkdb/default.nix b/pkgs/servers/nosql/rethinkdb/default.nix index e81ccb396322..ec1dbd763646 100644 --- a/pkgs/servers/nosql/rethinkdb/default.nix +++ b/pkgs/servers/nosql/rethinkdb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, protobuf, v8, ncurses, gperftools, boost, m4 }: +{ stdenv, fetchurl, which, protobuf, v8_3_14, ncurses, gperftools, boost, m4 }: stdenv.mkDerivation rec { name = "rethinkdb-1.11.2"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = "--lib-path ${gperftools}/lib"; - buildInputs = [ protobuf v8 ncurses boost ]; + buildInputs = [ protobuf v8_3_14 ncurses boost ]; nativeBuildInputs = [ which m4 ]; |