diff --git a/pkgs/development/libraries/wangle/default.nix b/pkgs/development/libraries/wangle/default.nix index c4ce19bd426e..26271c5f0ac7 100644 --- a/pkgs/development/libraries/wangle/default.nix +++ b/pkgs/development/libraries/wangle/default.nix @@ -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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0add6f0f4721..60b530948643 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11283,7 +11283,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 { };