From eaebf07d5c5eaacaf8cff8a819fc3a6fcc962c97 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 24 Jun 2022 13:02:54 -0300 Subject: [PATCH] mongodb-4_0: fixed Co-authored-by: @bryanasdev000 --- .../mongodb/patches/mongodb-4.0-glibc-2.34.patch | 14 ++++++++++++++ pkgs/servers/nosql/mongodb/v4_0.nix | 14 +++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch diff --git a/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch new file mode 100644 index 000000000000..f5c4a5c35408 --- /dev/null +++ b/pkgs/servers/nosql/mongodb/patches/mongodb-4.0-glibc-2.34.patch @@ -0,0 +1,14 @@ +--- a/src/mongo/stdx/thread.h ++++ b/src/mongo/stdx/thread.h +@@ -103,10 +103,7 @@ private: + // . N Y : 4,344 | 13,048 | 7,352 + // . Y Y : 4,424 | 13,672 | 8,392 + // ( https://jira.mongodb.org/secure/attachment/233569/233569_stacktrace-writeup.txt ) +- static constexpr std::size_t kMongoMinSignalStackSize = std::size_t{64} << 10; +- +- static constexpr std::size_t kStackSize = +- std::max(kMongoMinSignalStackSize, std::size_t{MINSIGSTKSZ}); ++ static constexpr std::size_t kStackSize = std::size_t{64} << 10; + std::unique_ptr _stackStorage = std::make_unique(kStackSize); + + #else // !MONGO_HAS_SIGALTSTACK \ No newline at end of file diff --git a/pkgs/servers/nosql/mongodb/v4_0.nix b/pkgs/servers/nosql/mongodb/v4_0.nix index 24349686fbec..9d28a9185ba1 100644 --- a/pkgs/servers/nosql/mongodb/v4_0.nix +++ b/pkgs/servers/nosql/mongodb/v4_0.nix @@ -1,4 +1,4 @@ -{ stdenv, callPackage, lib, sasl, boost, Security, CoreFoundation, cctools }: +{ stdenv, callPackage, fetchpatch, lib, sasl, boost, Security, CoreFoundation, cctools }: let buildMongoDB = callPackage ./mongodb.nix { @@ -11,7 +11,15 @@ let in buildMongoDB { version = "4.0.27"; sha256 = "sha256-ct33mnK4pszhYM4Is7j0GZQRyi8i8Qmy0wcklyq5LjM="; - patches = - [ ./forget-build-dependencies.patch ./mozjs-45_fix-3-byte-opcode.patch ] + patches = [ + ./forget-build-dependencies.patch + ./mozjs-45_fix-3-byte-opcode.patch + ./patches/mongodb-4.0-glibc-2.34.patch # https://github.com/NixOS/nixpkgs/issues/171928 + (fetchpatch { + name = "mongodb-4.4.1-gcc11.patch"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/7168257cad6ea7c4856b01c5703d0ed5b764367c/dev-db/mongodb/files/mongodb-4.4.1-gcc11.patch"; + sha256 = "sha256-RvfCP462RG+ZVjcb23DgCuxCdfPl2/UgH8N7FgCghGI="; + }) + ] ++ lib.optionals stdenv.isDarwin [ ./asio-no-experimental-string-view.patch ]; }