summary refs log tree commit diff
path: root/pkgs/servers/nosql/mongodb
diff options
context:
space:
mode:
authorJoachim Fasting <joachifm@fastmail.fm>2016-03-18 18:47:04 +0100
committerJoachim Fasting <joachifm@fastmail.fm>2016-03-18 18:47:04 +0100
commit29668ba9206eb82a6446e819a19183b1bc168a8a (patch)
treede08145178f7cbd474dddb5c2ac25b77d143d683 /pkgs/servers/nosql/mongodb
parent5bb0aa3bacb39ed910d6b8c7b86672d851662361 (diff)
downloadnixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar.gz
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar.bz2
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar.lz
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar.xz
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.tar.zst
nixlib-29668ba9206eb82a6446e819a19183b1bc168a8a.zip
mongodb: fix build against boost-1.60
Apply patch from Arch Linux. Suggested by @wkennington.
Diffstat (limited to 'pkgs/servers/nosql/mongodb')
-rw-r--r--pkgs/servers/nosql/mongodb/default.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix
index 2ea255e4432d..289607328d62 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