wangle: convert to new Darwin SDK pattern
(cherry picked from commit b21418c8d8)
(cherry picked from commit 53c52162be756785e5839c24e0810eb26ce9efd7)
This commit is contained in:
@@ -11,6 +11,8 @@
|
||||
fizz,
|
||||
folly,
|
||||
gtest,
|
||||
apple-sdk_11,
|
||||
darwinMinVersionHook,
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation (finalAttrs: {
|
||||
@@ -28,25 +30,26 @@ stdenv.mkDerivation (finalAttrs: {
|
||||
|
||||
cmakeDir = "../wangle";
|
||||
|
||||
cmakeFlags =
|
||||
cmakeFlags = [
|
||||
"-Wno-dev"
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
];
|
||||
|
||||
buildInputs =
|
||||
[
|
||||
"-Wno-dev"
|
||||
(lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck)
|
||||
double-conversion
|
||||
fizz
|
||||
folly
|
||||
glog
|
||||
gflags
|
||||
libevent
|
||||
openssl
|
||||
]
|
||||
++ lib.optionals stdenv.hostPlatform.isDarwin [
|
||||
"-DCMAKE_OSX_DEPLOYMENT_TARGET=10.14" # For aligned allocation
|
||||
apple-sdk_11
|
||||
(darwinMinVersionHook "11.0")
|
||||
];
|
||||
|
||||
buildInputs = [
|
||||
double-conversion
|
||||
fizz
|
||||
folly
|
||||
glog
|
||||
gflags
|
||||
libevent
|
||||
openssl
|
||||
];
|
||||
|
||||
doCheck = true;
|
||||
checkInputs = [
|
||||
gtest
|
||||
|
||||
@@ -11100,7 +11100,7 @@ with pkgs;
|
||||
vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
|
||||
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
|
||||
};
|
||||
wangle = darwin.apple_sdk_11_0.callPackage ../development/libraries/wangle { };
|
||||
wangle = callPackage ../development/libraries/wangle { };
|
||||
|
||||
wayland = darwin.apple_sdk_11_0.callPackage ../development/libraries/wayland { };
|
||||
wayland-scanner = callPackage ../development/libraries/wayland/scanner.nix { };
|
||||
|
||||
Reference in New Issue
Block a user