summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorarcher-65 <mario.liguori.056@gmail.com>2022-11-23 23:53:01 +0100
committergithub-actions[bot] <github-actions[bot]@users.noreply.github.com>2022-11-30 23:28:22 +0000
commit46b2a026e70b121cf12ee40e8e60ee6f0ec5eff2 (patch)
treebce6c9e2c681e92577957c013f1dbf0e9407fe23
parentMerge pull request #203645 from NixOS/backport-203398-to-release-22.11 (diff)
downloadnixpkgs-origin/backport-202609-to-release-22.11.tar.gz
(cherry picked from commit 78708cb7b220ae191083305e0528afb60c3fa506)
-rw-r--r--maintainers/maintainer-list.nix6
-rw-r--r--pkgs/development/libraries/mongoc/default.nix32
2 files changed, 31 insertions, 7 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ee2014d6525b..a1324408e3a5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1071,6 +1071,12 @@
githubId = 56009;
name = "Arcadio Rubio GarcĂ­a";
};
+ archer-65 = {
+ email = "mario.liguori.056@gmail.com";
+ github = "archer-65";
+ githubId = 76066109;
+ name = "Mario Liguori";
+ };
archseer = {
email = "blaz@mxxn.io";
github = "archseer";
diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix
index 8b5753b3aca9..ecb247de0ba4 100644
--- a/pkgs/development/libraries/mongoc/default.nix
+++ b/pkgs/development/libraries/mongoc/default.nix
@@ -1,19 +1,36 @@
-{ lib, stdenv, fetchzip, perl, pkg-config, libbson
-, openssl, which, zlib, snappy
+{
+ lib,
+ stdenv,
+ fetchzip,
+ cmake,
+ pkg-config,
+ perl,
+ openssl,
+ zlib,
+ cyrus_sasl,
+ libbson,
+ snappy,
}:
-
stdenv.mkDerivation rec {
pname = "mongoc";
- version = "1.8.0";
+ version = "1.23.1";
src = fetchzip {
url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz";
sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8";
};
- nativeBuildInputs = [ pkg-config which perl ];
- buildInputs = [ openssl zlib ];
- propagatedBuildInputs = [ libbson snappy ];
+ # https://github.com/NixOS/nixpkgs/issues/25585
+ preFixup = ''rm -rf "$(pwd)" '';
+
+ nativeBuildInputs = [cmake pkg-config perl];
+ buildInputs = [openssl zlib cyrus_sasl];
+ propagatedBuildInputs = [libbson snappy];
+
+ # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF
+ # The `mongodl.py` script is causing issues, and you also need to disabled sandboxing for it. However, it is used only to run some tests.
+ # https://www.mongodb.com/community/forums/t/problem-downloading-crypt-shared-when-installing-the-mongodb-c-driver/189370
+ cmakeFlags = ["-DCMAKE_BUILD_TYPE=Release" "-DENABLE_AUTOMATIC_INIT_AND_CLEANUP=OFF" "-DMONGOC_TEST_USE_CRYPT_SHARED=OFF"];
enableParallelBuilding = true;
@@ -22,6 +39,7 @@ stdenv.mkDerivation rec {
homepage = "http://mongoc.org";
license = licenses.asl20;
mainProgram = "mongoc-stat";
+ maintainers = with maintainers; [archer-65];
platforms = platforms.all;
};
}