mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-22 15:03:28 +00:00
fizz: convert to new Darwin SDK pattern
(cherry picked from commit 91c31b1069
)
This commit is contained in:
parent
342b7edf01
commit
979e60c718
@ -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 = [
|
||||
|
@ -9203,7 +9203,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 { };
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user