fizz: convert to new Darwin SDK pattern

(cherry picked from commit 91c31b1069)
(cherry picked from commit 979e60c7184795ed91478c685f5f976824bf713e)
This commit is contained in:
Emily
2024-11-30 15:11:15 +01:00
committed by Vladimír Čunát
parent 15de9b55e1
commit 3aa8b5fcd4
2 changed files with 24 additions and 21 deletions
+23 -20
View File
@@ -14,6 +14,8 @@
libsodium,
gtest,
zlib,
apple-sdk_11,
darwinMinVersionHook,
}:
stdenv.mkDerivation (finalAttrs: {
@@ -31,29 +33,30 @@ stdenv.mkDerivation (finalAttrs: {
cmakeDir = "../fizz";
cmakeFlags =
[
"-Wno-dev"
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
];
cmakeFlags = [
"-Wno-dev"
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
];
NIX_LDFLAGS = "-lz";
buildInputs = [
double-conversion
folly
glog
gflags
libevent
libiberty
libsodium
openssl
zlib
zstd
];
buildInputs =
[
double-conversion
folly
glog
gflags
libevent
libiberty
libsodium
openssl
zlib
zstd
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
doCheck = true;
checkInputs = [
+1 -1
View File
@@ -9092,7 +9092,7 @@ with pkgs;
};
fftwMpi = fftw.override { enableMpi = true; };
fizz = darwin.apple_sdk_11_0.callPackage ../development/libraries/fizz { };
fizz = callPackage ../development/libraries/fizz { };
flint = callPackage ../development/libraries/flint { };