diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index ef3aa77278ca..81d36eb232fa 100644 --- a/pkgs/servers/nosql/mongodb/6.0.nix +++ b/pkgs/servers/nosql/mongodb/6.0.nix @@ -2,7 +2,7 @@ let buildMongoDB = callPackage ./mongodb.nix { - inherit sasl boost Security CoreFoundation cctools; + inherit sasl boost Security CoreFoundation cctools stdenv; }; in buildMongoDB { diff --git a/pkgs/servers/nosql/mongodb/mongodb.nix b/pkgs/servers/nosql/mongodb/mongodb.nix index f0039a509c15..7be4064dd7f3 100644 --- a/pkgs/servers/nosql/mongodb/mongodb.nix +++ b/pkgs/servers/nosql/mongodb/mongodb.nix @@ -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 ' '#include #include ' substituteInPlace src/mongo/db/exec/plan_stats.h --replace '#include ' '#include #include ' - '' + 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; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23a5d7014e08..40b828322a84 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };