treewide: switch to moltenvk from darwin.moltenvk

This commit is contained in:
Randy Eckenrode 2024-10-06 19:27:33 -04:00
parent f9e5f1290d
commit d8906e4851
No known key found for this signature in database
GPG Key ID: 64C1CD4EC2A600D9
3 changed files with 5 additions and 8 deletions

View File

@ -39,7 +39,7 @@
waylandSupport ? false,
x11Support ? false,
embedInstallers ? false, # The Mono and Gecko MSI installers
moltenvk ? darwin.moltenvk # Allow users to override MoltenVK easily
moltenvk # Allow users to override MoltenVK easily
}:
let wine-build = build: release:

View File

@ -19,6 +19,7 @@
libsepol,
libxcb,
makeBinaryWrapper,
moltenvk,
nix-update-script,
ocl-icd,
opencl-headers,
@ -119,7 +120,7 @@ stdenv'.mkDerivation (finalAttrs: {
MediaRemote
OpenCL
SystemConfiguration
darwin.moltenvk
moltenvk
]
);

View File

@ -2672,7 +2672,6 @@ with pkgs;
dolphin-emu = qt6Packages.callPackage ../applications/emulators/dolphin-emu {
stdenv = if stdenv.hostPlatform.isDarwin then overrideSDK stdenv "11.0" else stdenv;
inherit (darwin.apple_sdk_11_0.frameworks) CoreBluetooth ForceFeedback IOBluetooth IOKit OpenGL VideoToolbox;
inherit (darwin) moltenvk;
};
dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
@ -23479,9 +23478,8 @@ with pkgs;
vulkan-extension-layer = callPackage ../tools/graphics/vulkan-extension-layer { };
vulkan-headers = callPackage ../development/libraries/vulkan-headers { };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { inherit (darwin) moltenvk; };
vulkan-loader = callPackage ../development/libraries/vulkan-loader { };
vulkan-tools = callPackage ../tools/graphics/vulkan-tools {
inherit (darwin) moltenvk;
inherit (darwin.apple_sdk.frameworks) AppKit Cocoa;
};
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
@ -35148,9 +35146,7 @@ with pkgs;
quakespasm = callPackage ../games/quakespasm {
inherit (darwin.apple_sdk.frameworks) Cocoa CoreAudio CoreFoundation IOKit OpenGL;
};
vkquake = callPackage ../games/quakespasm/vulkan.nix {
inherit (darwin) moltenvk;
};
vkquake = callPackage ../games/quakespasm/vulkan.nix { };
ioquake3 = callPackage ../games/quake3/ioquake { };
quake3e = callPackage ../games/quake3/quake3e { };