nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-02-17 01:24:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

fizz: convert to new Darwin SDK pattern

Browse Source
This commit is contained in:
Emily 2024-11-13 13:51:53 +00:00
parent 95d28ae657
commit 91c31b1069
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkgs/development/libraries/fizz/default.nix
View File

@ -14,6 +14,8 @@
libsodium, libsodium,
gtest, gtest,
zlib, zlib,
apple-sdk_11,
darwinMinVersionHook,
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
@ -31,18 +33,15 @@ stdenv.mkDerivation (finalAttrs: {
cmakeDir = "../fizz"; cmakeDir = "../fizz";
cmakeFlags = cmakeFlags = [
[
"-Wno-dev" "-Wno-dev"
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
]; ];
NIX_LDFLAGS = "-lz"; NIX_LDFLAGS = "-lz";
buildInputs = [ buildInputs =
[
double-conversion double-conversion
folly folly
glog glog
@ -53,6 +52,10 @@ stdenv.mkDerivation (finalAttrs: {
openssl openssl
zlib zlib
zstd zstd
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
]; ];
doCheck = true; doCheck = true;

2
pkgs/top-level/all-packages.nix
View File

@ -9270,7 +9270,7 @@ with pkgs;
}; };
fftwMpi = fftw.override { enableMpi = true; }; 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 { }; flint = callPackage ../development/libraries/flint { };