Skip to content

Commit f6b0b92

Browse files
authored
mongodb{,-6_0}: use new apple sdk pattern (NixOS#370666)
2 parents e8afaf8 + 67dfca0 commit f6b0b92

File tree

4 files changed

+2
-30
lines changed

4 files changed

+2
-30
lines changed

pkgs/servers/nosql/mongodb/6.0.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
fetchpatch,
55
sasl,
66
boost,
7-
Security,
8-
CoreFoundation,
97
cctools,
108
avxSupport ? stdenv.hostPlatform.avxSupport,
119
}:
@@ -15,8 +13,6 @@ let
1513
inherit
1614
sasl
1715
boost
18-
Security
19-
CoreFoundation
2016
cctools
2117
stdenv
2218
;

pkgs/servers/nosql/mongodb/7.0.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
callPackage,
44
sasl,
55
boost,
6-
Security,
7-
CoreFoundation,
86
cctools,
97
avxSupport ? stdenv.hostPlatform.avxSupport,
108
nixosTests,
@@ -16,8 +14,6 @@ let
1614
inherit
1715
sasl
1816
boost
19-
Security
20-
CoreFoundation
2117
cctools
2218
stdenv
2319
;

pkgs/servers/nosql/mongodb/mongodb.nix

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
openssl,
1717
libpcap,
1818
curl,
19-
Security,
20-
CoreFoundation,
2119
cctools,
2220
xz,
2321
}:
@@ -102,8 +100,6 @@ stdenv.mkDerivation rec {
102100
zlib
103101
]
104102
++ lib.optionals stdenv.hostPlatform.isDarwin [
105-
Security
106-
CoreFoundation
107103
cctools
108104
]
109105
++ lib.optional stdenv.hostPlatform.isLinux net-snmp

pkgs/top-level/all-packages.nix

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11735,30 +11735,14 @@ with pkgs;
1173511735

1173611736
mongodb = hiPrio mongodb-7_0;
1173711737

11738-
mongodb-6_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/6.0.nix {
11738+
mongodb-6_0 = callPackage ../servers/nosql/mongodb/6.0.nix {
1173911739
sasl = cyrus_sasl;
1174011740
boost = boost178.override { enableShared = false; };
11741-
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
11742-
stdenv = if stdenv.hostPlatform.isDarwin then
11743-
darwin.apple_sdk_11_0.stdenv.override (old: {
11744-
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
11745-
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
11746-
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
11747-
}) else
11748-
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
1174911741
};
1175011742

11751-
mongodb-7_0 = darwin.apple_sdk_11_0.callPackage ../servers/nosql/mongodb/7.0.nix {
11743+
mongodb-7_0 = callPackage ../servers/nosql/mongodb/7.0.nix {
1175211744
sasl = cyrus_sasl;
1175311745
boost = boost179.override { enableShared = false; };
11754-
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
11755-
stdenv = if stdenv.hostPlatform.isDarwin then
11756-
darwin.apple_sdk_11_0.stdenv.override (old: {
11757-
hostPlatform = old.hostPlatform // { darwinMinVersion = "10.14"; };
11758-
buildPlatform = old.buildPlatform // { darwinMinVersion = "10.14"; };
11759-
targetPlatform = old.targetPlatform // { darwinMinVersion = "10.14"; };
11760-
}) else
11761-
if stdenv.cc.isClang then llvmPackages.stdenv else stdenv;
1176211746
};
1176311747

1176411748
influxdb = callPackage ../servers/nosql/influxdb { };

0 commit comments

Comments
 (0)