BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #169782 from reckenrode/moltenvk-hydra

Browse source 
moltenvk: fix Hydra build failures
This commit is contained in:
Rick van Schijndel 2022-05-18 20:03:07 +02:00 committed by GitHub
commit 83561001b3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/os-specific/darwin/moltenvk/default.nix
View file

@ -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;
};

6
pkgs/top-level/wine-packages.nix
View file

@ -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;
};