diff --git a/pkgs/development/libraries/fbthrift/default.nix b/pkgs/development/libraries/fbthrift/default.nix index b150283bb1cb..818404c06b84 100644 --- a/pkgs/development/libraries/fbthrift/default.nix +++ b/pkgs/development/libraries/fbthrift/default.nix @@ -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"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6aa5f52f07a..339949e192dd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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 { };