From 87a7353f0c9ef56525c290ad50fe1d2b4e4bfa84 Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 15:28:33 +0000 Subject: [PATCH] fb303: convert to new Darwin SDK pattern --- pkgs/development/libraries/fb303/default.nix | 27 +++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/fb303/default.nix b/pkgs/development/libraries/fb303/default.nix index bedd96f9d59c..14353bc4b5ee 100644 --- a/pkgs/development/libraries/fb303/default.nix +++ b/pkgs/development/libraries/fb303/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 98aede8ab945..76474355a4c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9242,7 +9242,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