diff --git a/pkgs/applications/emulators/dolphin-emu/default.nix b/pkgs/by-name/do/dolphin-emu/package.nix similarity index 93% rename from pkgs/applications/emulators/dolphin-emu/default.nix rename to pkgs/by-name/do/dolphin-emu/package.nix index 30fcee0993ae..b9f393823c4f 100644 --- a/pkgs/applications/emulators/dolphin-emu/default.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -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 = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 16fd58b44885..2d0d0322a884 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -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; };