public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #14025 from joachifm/mongodb-boost160

Browse Source 
mongodb: fix build against boost-1.60
This commit is contained in:
Peter Simons 2016-03-18 20:04:21 +01:00
commit bcb698e4d4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkgs/servers/nosql/mongodb/default.nix
View File

@ -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