treewide: drop darwinMinVersionHook for macOS < 11 (#370693)
This commit is contained in:
@@ -6,8 +6,6 @@
|
||||
bzip2,
|
||||
zstd,
|
||||
stdenv,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
rocksdb,
|
||||
nix-update-script,
|
||||
testers,
|
||||
@@ -55,12 +53,7 @@ rustPlatform.buildRustPackage rec {
|
||||
zstd
|
||||
]
|
||||
++ lib.optional enableJemalloc rust-jemalloc-sys'
|
||||
++ lib.optional enableLiburing liburing
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
# aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
++ lib.optional enableLiburing liburing;
|
||||
|
||||
env = {
|
||||
ZSTD_SYS_USE_PKG_CONFIG = true;
|
||||
|
||||
@@ -29,8 +29,6 @@
|
||||
stdenv,
|
||||
testers,
|
||||
zlib-ng,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -81,11 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
speexdsp
|
||||
zlib-ng
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
(darwinMinVersionHook "10.15") # from https://www.dosbox-staging.org/releases/macos/
|
||||
];
|
||||
++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib ];
|
||||
|
||||
outputs = [ "out" "man" ];
|
||||
|
||||
|
||||
@@ -11,8 +11,6 @@
|
||||
# buildInputs
|
||||
fontconfig,
|
||||
openssl,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
|
||||
redis,
|
||||
versionCheckHook,
|
||||
@@ -40,16 +38,10 @@ rustPlatform.buildRustPackage rec {
|
||||
rustPlatform.bindgenHook
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
fontconfig
|
||||
(lib.getDev openssl)
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_15
|
||||
# aws-lc-sys requires CryptoKit's CommonCrypto, which is available on macOS 10.15+
|
||||
(darwinMinVersionHook "10.15")
|
||||
];
|
||||
buildInputs = [
|
||||
fontconfig
|
||||
(lib.getDev openssl)
|
||||
];
|
||||
|
||||
# Required for golem-wasm-rpc's build.rs to find the required protobuf files
|
||||
# https://github.com/golemcloud/wasm-rpc/blob/v1.0.6/wasm-rpc/build.rs#L7
|
||||
|
||||
@@ -5,7 +5,6 @@
|
||||
fetchpatch2,
|
||||
gitUpdater,
|
||||
apple-sdk_15,
|
||||
darwinMinVersionHook,
|
||||
cereal,
|
||||
libcxx,
|
||||
glslang,
|
||||
@@ -31,7 +30,6 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
buildInputs = [
|
||||
apple-sdk_15
|
||||
cereal
|
||||
(darwinMinVersionHook "10.15")
|
||||
glslang
|
||||
spirv-cross
|
||||
spirv-headers
|
||||
|
||||
@@ -3,7 +3,6 @@
|
||||
apple-sdk_14,
|
||||
buildGoModule,
|
||||
darwin,
|
||||
darwinMinVersionHook,
|
||||
fetchFromGitHub,
|
||||
testers,
|
||||
vfkit,
|
||||
@@ -36,7 +35,6 @@ buildGoModule rec {
|
||||
|
||||
buildInputs = [
|
||||
apple-sdk_14
|
||||
(darwinMinVersionHook "11")
|
||||
];
|
||||
|
||||
postFixup = ''
|
||||
|
||||
@@ -234,13 +234,11 @@ in stdenv.mkDerivation {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_swift
|
||||
(darwinMinVersionHook deploymentVersion)
|
||||
];
|
||||
|
||||
# Will effectively be `buildInputs` when swift is put in `nativeBuildInputs`.
|
||||
depsTargetTargetPropagated = lib.optionals stdenv.targetPlatform.isDarwin [
|
||||
apple-sdk_swift
|
||||
(darwinMinVersionHook deploymentVersion)
|
||||
];
|
||||
|
||||
# This is a partial reimplementation of our setup hook. Because we reuse
|
||||
|
||||
@@ -77,7 +77,6 @@ let
|
||||
|
||||
swiftpm = callPackage ./swiftpm {
|
||||
inherit (darwin) DarwinTools;
|
||||
inherit (apple_sdk.frameworks) CryptoKit LocalAuthentication;
|
||||
swift = swiftNoSwiftDriver;
|
||||
};
|
||||
|
||||
|
||||
@@ -18,10 +18,7 @@
|
||||
makeWrapper,
|
||||
DarwinTools, # sw_vers
|
||||
cctools, # vtool
|
||||
darwinMinVersionHook,
|
||||
xcbuild,
|
||||
CryptoKit,
|
||||
LocalAuthentication,
|
||||
}:
|
||||
|
||||
let
|
||||
@@ -387,7 +384,7 @@ let
|
||||
swift-driver
|
||||
swift-system
|
||||
swift-tools-support-core
|
||||
] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
|
||||
];
|
||||
|
||||
cmakeFlags = [
|
||||
"-DUSE_CMAKE_INSTALL=ON"
|
||||
@@ -413,17 +410,11 @@ stdenv.mkDerivation (
|
||||
swift
|
||||
swiftpm-bootstrap
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
ncursesInput
|
||||
sqlite
|
||||
XCTest
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
CryptoKit
|
||||
LocalAuthentication
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [ (darwinMinVersionHook "10.15.4") ];
|
||||
buildInputs = [
|
||||
ncursesInput
|
||||
sqlite
|
||||
XCTest
|
||||
];
|
||||
|
||||
configurePhase =
|
||||
generated.configure
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
openimageio,
|
||||
imath,
|
||||
python,
|
||||
darwinMinVersionHook,
|
||||
apple-sdk_14,
|
||||
}:
|
||||
|
||||
@@ -40,7 +39,6 @@ buildPythonPackage rec {
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_14
|
||||
(darwinMinVersionHook "10.15")
|
||||
]
|
||||
++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
|
||||
libX11
|
||||
|
||||
Reference in New Issue
Block a user