From 961ea0f492fd64bc251719c00026b7df3f0bcb7f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 25 Feb 2015 11:28:42 -0800 Subject: [PATCH] mongodb: Support boost 1.57 --- pkgs/servers/nosql/mongodb/default.nix | 3 +++ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index d307915d2f5..90e229d54ac 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -41,6 +41,9 @@ in stdenv.mkDerivation rec { # bug #482576 sed -i -e "/-Werror/d" src/third_party/v8/SConscript + # fix inclusion of std::swap + sed -i '1i #include ' src/mongo/shell/linenoise_utf8.h + # fix environment variable reading substituteInPlace SConstruct \ --replace "Environment( BUILD_DIR" "Environment( ENV = os.environ, BUILD_DIR" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db97fb7126d..71d4ca4d523 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8153,7 +8153,6 @@ let mariadb = callPackage ../servers/sql/mariadb {}; mongodb = callPackage ../servers/nosql/mongodb { - boost = boost156; sasl = cyrus_sasl; };