dolphin-emu: move to by-name

This commit is contained in:
Gaetan Lepage
2025-03-17 07:22:52 +01:00
parent 1cd73eee4a
commit 6b444b590f
2 changed files with 4 additions and 23 deletions
@@ -4,7 +4,6 @@
fetchFromGitHub,
cmake,
pkg-config,
wrapQtAppsHook,
alsa-lib,
bluez,
bzip2,
@@ -31,8 +30,7 @@
minizip-ng,
openal,
pugixml,
qtbase,
qtsvg,
qt6,
SDL2,
sfml,
udev,
@@ -44,13 +42,7 @@
testers,
# Darwin-only dependencies
CoreBluetooth,
ForceFeedback,
IOBluetooth,
IOKit,
moltenvk,
OpenGL,
VideoToolbox,
xcbuild,
}:
@@ -72,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
[
cmake
pkg-config
wrapQtAppsHook
qt6.wrapQtAppsHook
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
xcbuild # for plutil
@@ -100,8 +92,8 @@ stdenv.mkDerivation (finalAttrs: {
minizip-ng
openal
pugixml
qtbase
qtsvg
qt6.qtbase
qt6.qtsvg
SDL2
sfml
xxHash
@@ -122,13 +114,7 @@ stdenv.mkDerivation (finalAttrs: {
vulkan-loader
]
++ lib.optionals stdenv.hostPlatform.isDarwin [
CoreBluetooth
ForceFeedback
IOBluetooth
IOKit
moltenvk
OpenGL
VideoToolbox
];
cmakeFlags =
-5
View File
@@ -1437,11 +1437,6 @@ with pkgs;
### APPLICATIONS/EMULATORS/DOLPHIN-EMU
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;
};
dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix {
inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL;
};