From 08b9cb9e7033e6f3aef2b4e46e0e927800b50a0e Mon Sep 17 00:00:00 2001 From: Yan Date: Mon, 13 Feb 2023 23:31:50 +0200 Subject: [PATCH 1/5] mongoc: 1.23.1 -> 1.23.2 --- pkgs/development/libraries/mongoc/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index ecb247de0ba4..abdb4e15ccf1 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -13,15 +13,21 @@ }: stdenv.mkDerivation rec { pname = "mongoc"; - version = "1.23.1"; + version = "1.23.2"; src = fetchzip { url = "https://github.com/mongodb/mongo-c-driver/releases/download/${version}/mongo-c-driver-${version}.tar.gz"; - sha256 = "1vnnk3pwbcmwva1010bl111kdcdx3yb2w7j7a78hhvrm1k9r1wp8"; + sha256 = "08v7xc5m86apd338swd8g83ccvd6ni75xbdhqqwkrjbznljf8fjf"; }; # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + postPatch = '' + substituteInPlace src/libmongoc/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + substituteInPlace src/libbson/CMakeLists.txt \ + --replace "\\\''${prefix}/" "" + ''; nativeBuildInputs = [cmake pkg-config perl]; buildInputs = [openssl zlib cyrus_sasl]; From b68077df875d866a239a0ba5938159c652a57422 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 14 Feb 2023 17:09:48 +0200 Subject: [PATCH 2/5] mongoc: add Security Framework Darwin build dep --- pkgs/development/libraries/mongoc/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index abdb4e15ccf1..80bb9633737a 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -10,7 +10,11 @@ cyrus_sasl, libbson, snappy, + darwin, }: +let + inherit (darwin.apple_sdk.frameworks) Security; +in stdenv.mkDerivation rec { pname = "mongoc"; version = "1.23.2"; @@ -30,7 +34,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [cmake pkg-config perl]; - buildInputs = [openssl zlib cyrus_sasl]; + buildInputs = [openssl zlib cyrus_sasl] ++ lib.optionals stdenv.isDarwin [Security]; propagatedBuildInputs = [libbson snappy]; # -DMONGOC_TEST_USE_CRYPT_SHARED=OFF From b8eadbe19ff82b4c13d6ac53569f8f5306f51447 Mon Sep 17 00:00:00 2001 From: Yan Date: Tue, 14 Feb 2023 17:12:55 +0200 Subject: [PATCH 3/5] mongoc: formatting --- pkgs/development/libraries/mongoc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 80bb9633737a..162744776359 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -14,7 +14,7 @@ }: let inherit (darwin.apple_sdk.frameworks) Security; -in +in stdenv.mkDerivation rec { pname = "mongoc"; version = "1.23.2"; From 8ef4c0860c7259ccdebed57f98fe2aa8b056311a Mon Sep 17 00:00:00 2001 From: Yan Date: Fri, 17 Feb 2023 00:46:55 +0200 Subject: [PATCH 4/5] mongoc: mark darwin x86_64 as broken --- pkgs/development/libraries/mongoc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 162744776359..97490748540e 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -45,6 +45,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { + broken = stdenv.isDarwin && stdenv.isx86_64; description = "The official C client library for MongoDB"; homepage = "http://mongoc.org"; license = licenses.asl20; From 3dbc3b9c6502c48c71c3e9598a7f47d4d7bdcd6e Mon Sep 17 00:00:00 2001 From: Yan Date: Sat, 18 Feb 2023 00:12:15 +0200 Subject: [PATCH 5/5] mongoc: add patch documentation --- pkgs/development/libraries/mongoc/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/mongoc/default.nix b/pkgs/development/libraries/mongoc/default.nix index 97490748540e..905d8330fe4d 100644 --- a/pkgs/development/libraries/mongoc/default.nix +++ b/pkgs/development/libraries/mongoc/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { # https://github.com/NixOS/nixpkgs/issues/25585 preFixup = ''rm -rf "$(pwd)" ''; + # https://github.com/mongodb/mongo-c-driver/pull/1157 + # related: + # https://github.com/NixOS/nixpkgs/issues/144170 + # mongoc's cmake incorrectly injects a prefix to library paths, breaking Nix. This removes the prefix from paths. postPatch = '' substituteInPlace src/libmongoc/CMakeLists.txt \ --replace "\\\''${prefix}/" ""