diff options
author | Doro Rose <doroerose@gmail.com> | 2022-09-15 01:30:54 +0200 |
---|---|---|
committer | Doro Rose <doroerose@gmail.com> | 2022-10-24 08:59:13 +0200 |
commit | 9a99aff2f343ac3836051acde2ba8a419a0ee149 (patch) | |
tree | 3508678958d0fe2a42a4a9eeaf91795a2dafcb3a /pkgs/servers/nosql/mongodb | |
parent | 90eb7cc0aaf1b1c0ce40da6e0d6c4912a5aa7382 (diff) |
mongoDB: Enable 6.0 update for darwin
Diffstat (limited to 'pkgs/servers/nosql/mongodb')
-rw-r--r-- | pkgs/servers/nosql/mongodb/6.0.nix | 2 | ||||
-rw-r--r-- | pkgs/servers/nosql/mongodb/mongodb.nix | 9 |
2 files changed, 4 insertions, 7 deletions
diff --git a/pkgs/servers/nosql/mongodb/6.0.nix b/pkgs/servers/nosql/mongodb/6.0.nix index ef3aa77278ca0..81d36eb232fa0 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 88dcfdcb7080b..2bff3de6371e2 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 <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; }; } |