From 29668ba9206eb82a6446e819a19183b1bc168a8a Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 18 Mar 2016 18:47:04 +0100 Subject: [PATCH] mongodb: fix build against boost-1.60 Apply patch from Arch Linux. Suggested by @wkennington. --- pkgs/servers/nosql/mongodb/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 2ea255e4432..289607328d6 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, scons, boost, gperftools, pcre, snappy +{ stdenv, fetchurl, fetchpatch, scons, boost, gperftools, pcre, snappy , zlib, libyamlcpp, sasl, openssl, libpcap, wiredtiger }: @@ -53,7 +53,14 @@ in stdenv.mkDerivation rec { # vendored header file - regardless of whether or not we're using the system # tcmalloc - so we need to lift the include path manipulation out of the # conditional. - patches = [ ./valgrind-include.patch ]; + patches = + [ ./valgrind-include.patch + (fetchpatch { + url = https://projects.archlinux.org/svntogit/community.git/plain/trunk/boost160.patch?h=packages/mongodb; + name = "boost160.patch"; + sha256 = "0bvsf3499zj55pzamwjmsssr6x63w434944w76273fr5rxwzcmh8"; + }) + ]; postPatch = '' # fix environment variable reading