fb303: convert to new Darwin SDK pattern

(cherry picked from commit 87a7353f0c)
(cherry picked from commit e6dba6330c60325e8115b95638fb561c98dc9196)
This commit is contained in:
Emily
2024-11-30 15:11:27 +01:00
committed by Vladimír Čunát
parent 762d5ea735
commit b156f19c35
2 changed files with 16 additions and 13 deletions
+15 -12
View File
@@ -9,6 +9,8 @@
glog,
python3,
wangle,
apple-sdk_11,
darwinMinVersionHook,
}:
stdenv.mkDerivation rec {
@@ -23,23 +25,24 @@ stdenv.mkDerivation rec {
};
nativeBuildInputs = [ cmake ];
cmakeFlags =
cmakeFlags = [
"-DPYTHON_EXTENSIONS=OFF"
];
buildInputs =
[
"-DPYTHON_EXTENSIONS=OFF"
fbthrift
fizz
folly
glog
python3
wangle
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
apple-sdk_11
(darwinMinVersionHook "11.0")
];
buildInputs = [
fbthrift
fizz
folly
glog
python3
wangle
];
meta = with lib; {
description = "Base Thrift service and a common set of functionality for querying stats, options, and other information from a service";
homepage = "https://github.com/facebook/fb303";
+1 -1
View File
@@ -9064,7 +9064,7 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
fb303 = darwin.apple_sdk_11_0.callPackage ../development/libraries/fb303 { };
fb303 = callPackage ../development/libraries/fb303 { };
inherit (callPackage ../development/libraries/ffmpeg { })
ffmpeg_4