swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 04:49:01 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #197499 from kfiz/Update-mongoDB-v6-darwin

Browse source
This commit is contained in:
Sandro 2022-12-24 02:25:35 +01:00 committed by GitHub
parent c48a958765 9a99aff2f3
commit 899c3c586c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/servers/nosql/mongodb/6.0.nix
View file

@ -2,7 +2,7 @@
let
buildMongoDB = callPackage ./mongodb.nix {
inherit sasl boost Security CoreFoundation cctools;
inherit sasl boost Security CoreFoundation cctools stdenv;
};
in
buildMongoDB {

9
pkgs/servers/nosql/mongodb/mongodb.nix
View file

@ -121,14 +121,14 @@ in stdenv.mkDerivation rec {
# fix environment variable reading
substituteInPlace SConstruct \
--replace "env = Environment(" "env = Environment(ENV = os.environ,"
'' + lib.optionalString (versionAtLeast version "4.4" && versionOlder version "4.6") ''
'' + lib.optionalString (versionAtLeast version "4.4") ''
# Fix debug gcc 11 and clang 12 builds on Fedora
# https://github.com/mongodb/mongo/commit/e78b2bf6eaa0c43bd76dbb841add167b443d2bb0.patch
substituteInPlace src/mongo/db/query/plan_summary_stats.h --replace '#include <string>' '#include <optional>
#include <string>'
substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include <string>' '#include <optional>
#include <string>'
'' + lib.optionalString stdenv.isDarwin ''
'' + lib.optionalString (stdenv.isDarwin && versionOlder version "6.0") ''
substituteInPlace src/third_party/mozjs-${variants.mozjsVersion}/extract/js/src/jsmath.cpp --replace '${variants.mozjsReplace}' 0
'' + lib.optionalString (stdenv.isDarwin && versionOlder version "3.6") ''
substituteInPlace src/third_party/s2/s1angle.cc --replace drem remainder
@ -197,9 +197,6 @@ in stdenv.mkDerivation rec {
inherit license;
maintainers = with maintainers; [ bluescreen303 offline cstrahan ];
platforms = subtractLists systems.doubles.i686 (
if (versionAtLeast version "6.0") then systems.doubles.linux
else systems.doubles.unix
);
platforms = subtractLists systems.doubles.i686 systems.doubles.unix;
};
}

9
pkgs/top-level/all-packages.nix
View file

@ -24452,11 +24452,18 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
};
mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix {
mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
sasl = cyrus_sasl;
boost = boost178.override { enableShared = false; };
inherit (darwin) cctools;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
stdenv = if stdenv.isDarwin then
darwin.apple_sdk_11_0.stdenv.override (old: {
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
}) else
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
};
nginx-sso = callPackage ../servers/nginx-sso { };