edencommon: convert to new Darwin SDK pattern
(cherry picked from commit 3c14c26a35)
(cherry picked from commit 353788c210496995fbd4c58af73362558999da14)
This commit is contained in:
@@ -6,6 +6,8 @@
|
||||
folly,
|
||||
glog,
|
||||
gtest,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -26,15 +28,16 @@ stdenv.mkDerivation rec {
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
glog
|
||||
folly
|
||||
gtest
|
||||
];
|
||||
buildInputs =
|
||||
[
|
||||
glog
|
||||
folly
|
||||
gtest
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Shared library for Meta's source control filesystem tools (EdenFS and Watchman)";
|
||||
|
||||
@@ -9022,7 +9022,7 @@ with pkgs;
|
||||
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
|
||||
};
|
||||
|
||||
edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { };
|
||||
edencommon = callPackage ../development/libraries/edencommon { };
|
||||
|
||||
eigen = callPackage ../development/libraries/eigen { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user