From 75c7e048010a501c20a301ac1cc86bdaa30fad5f Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 22 Apr 2022 08:54:54 -0400 Subject: [PATCH 1/2] moltenvk: fix Hydra build failures MoltenVK requires Xcode to build until a newer SDK (11+) is available in nixpkgs. Disable building on Hydra until that changes. --- pkgs/os-specific/darwin/moltenvk/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/darwin/moltenvk/default.nix b/pkgs/os-specific/darwin/moltenvk/default.nix index b2bc7e376b5..14d6287c479 100644 --- a/pkgs/os-specific/darwin/moltenvk/default.nix +++ b/pkgs/os-specific/darwin/moltenvk/default.nix @@ -192,6 +192,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/KhronosGroup/MoltenVK"; changelog = "https://github.com/KhronosGroup/MoltenVK/releases"; maintainers = [ lib.maintainers.reckenrode ]; + hydraPlatforms = [ ]; # Prevent building on Hydra until MoltenVK no longer requires Xcode. license = lib.licenses.asl20; platforms = lib.platforms.darwin; }; From 55d279809c7e4d876e137819d1e6c6d0fe28d66a Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 22 Apr 2022 09:38:47 -0400 Subject: [PATCH 2/2] wine-packages: fix Hydra build failures on Darwin Disable Vulkan and VKD3D by default on Darwin while MoltenVK is forced to build using Xcode instead of the SDK in nixpkgs. They can be overriden if the user needs either of those. --- pkgs/top-level/wine-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/wine-packages.nix b/pkgs/top-level/wine-packages.nix index c8bdaeb426e..d50b979fdce 100644 --- a/pkgs/top-level/wine-packages.nix +++ b/pkgs/top-level/wine-packages.nix @@ -12,7 +12,8 @@ rec { fontconfigSupport = stdenv.isLinux; alsaSupport = stdenv.isLinux; openglSupport = true; - vulkanSupport = true; + # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. + vulkanSupport = stdenv.isLinux; tlsSupport = true; cupsSupport = true; dbusSupport = stdenv.isLinux; @@ -40,7 +41,8 @@ rec { gphoto2Support = true; krb5Support = true; ldapSupport = true; - vkd3dSupport = true; + # Works on Darwin but disabled by default to prevent Hydra build failures due to MoltenVK. + vkd3dSupport = stdenv.isLinux; embedInstallers = true; };