2
0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 12:53:54 +00:00

mvfst: convert to new Darwin SDK pattern

(cherry picked from commit 5b60e96f64)
(cherry picked from commit 193326735b)
This commit is contained in:
Emily 2024-11-13 15:00:20 +00:00 committed by Vladimír Čunát
parent 0e41aed8ab
commit 550a372c86
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 14 additions and 11 deletions
pkgs
development/libraries/mvfst
top-level

View File

@ -7,6 +7,8 @@
folly,
gflags,
glog,
apple-sdk_11,
darwinMinVersionHook,
}:
stdenv.mkDerivation rec {
@ -22,16 +24,17 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
];
buildInputs = [
fizz
folly
gflags
glog
];
buildInputs =
[
fizz
folly
gflags
glog
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
meta = with lib; {
description = "Implementation of the QUIC transport protocol";

View File

@ -10349,7 +10349,7 @@ with pkgs;
mpich-pmix = mpich.override { pmixSupport = true; withPm = [ ]; };
mvfst = darwin.apple_sdk_11_0.callPackage ../development/libraries/mvfst { };
mvfst = callPackage ../development/libraries/mvfst { };
mygpoclient = with python3.pkgs; toPythonApplication mygpoclient;