fbthrift: convert to new Darwin SDK pattern
This commit is contained in:
@@ -17,6 +17,8 @@
|
||||
wangle,
|
||||
zlib,
|
||||
zstd,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
@@ -36,29 +38,30 @@ stdenv.mkDerivation rec {
|
||||
flex
|
||||
];
|
||||
|
||||
cmakeFlags =
|
||||
cmakeFlags = [
|
||||
"-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}"
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
"-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}"
|
||||
double-conversion
|
||||
fizz
|
||||
folly
|
||||
glog
|
||||
gflags
|
||||
libevent
|
||||
libiberty
|
||||
mvfst
|
||||
openssl
|
||||
wangle
|
||||
zlib
|
||||
zstd
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
double-conversion
|
||||
fizz
|
||||
folly
|
||||
glog
|
||||
gflags
|
||||
libevent
|
||||
libiberty
|
||||
mvfst
|
||||
openssl
|
||||
wangle
|
||||
zlib
|
||||
zstd
|
||||
];
|
||||
|
||||
meta = with lib; {
|
||||
description = "Facebook's branch of Apache Thrift";
|
||||
mainProgram = "thrift1";
|
||||
|
||||
@@ -9242,7 +9242,7 @@ with pkgs;
|
||||
autoreconfHook = buildPackages.autoreconfHook269;
|
||||
};
|
||||
|
||||
fbthrift = darwin.apple_sdk_11_0.callPackage ../development/libraries/fbthrift { };
|
||||
fbthrift = callPackage ../development/libraries/fbthrift { };
|
||||
|
||||
fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { };
|
||||
|
||||
|
||||
Reference in New Issue
Block a user