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

edencommon: convert to new Darwin SDK pattern

Browse Source 
(cherry picked from commit 3c14c26a35)
This commit is contained in:
Emily 2024-11-13 16:03:57 +00:00 committed by github-actions[bot]
parent a78bec1d8d
commit 353788c210
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pkgs/development/libraries/edencommon/default.nix
View File

@ -6,6 +6,8 @@
folly,
glog,
gtest,
apple-sdk_11,
darwinMinVersionHook,
}:
stdenv.mkDerivation rec {
@ -26,15 +28,16 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake ];
cmakeFlags = lib.optionals stdenv.hostPlatform.isDarwin [
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
];
buildInputs = [
glog
folly
gtest
];
buildInputs =
[
glog
folly
gtest
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
apple-sdk_11
(darwinMinVersionHook "11.0")
];
meta = with lib; {
description = "Shared library for Meta's source control filesystem tools (EdenFS and Watchman)";

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

@ -9129,7 +9129,7 @@ with pkgs;
stdenv = if stdenv.hostPlatform.isDarwin then gccStdenv else stdenv;
};
edencommon = darwin.apple_sdk_11_0.callPackage ../development/libraries/edencommon { };
edencommon = callPackage ../development/libraries/edencommon { };
eigen = callPackage ../development/libraries/eigen { };