diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix similarity index 91% rename from pkgs/applications/emulators/dolphin-emu/primehack.nix rename to pkgs/by-name/do/dolphin-emu-primehack/package.nix index 66200efda720..54735ae7dbbe 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -4,9 +4,7 @@ fetchFromGitHub, pkg-config, cmake, - wrapQtAppsHook, - qtbase, - qtsvg, + qt6, bluez, ffmpeg, libao, @@ -40,10 +38,6 @@ libpulseaudio, # - Inputs used for Darwin - CoreBluetooth, - ForceFeedback, - IOKit, - OpenGL, libpng, hidapi, }: @@ -63,7 +57,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config cmake - ] ++ lib.optional stdenv.hostPlatform.isLinux wrapQtAppsHook; + ] ++ lib.optional stdenv.hostPlatform.isLinux qt6.wrapQtAppsHook; buildInputs = [ @@ -95,8 +89,8 @@ stdenv.mkDerivation rec { sfml fmt xz - qtbase - qtsvg + qt6.qtbase + qt6.qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez @@ -104,12 +98,6 @@ stdenv.mkDerivation rec { libevdev alsa-lib vulkan-loader - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - CoreBluetooth - OpenGL - ForceFeedback - IOKit ]; cmakeFlags = diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2d0d0322a884..be3503ff7b60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1433,14 +1433,6 @@ with pkgs; zsnes = pkgsi686Linux.callPackage ../applications/emulators/zsnes { }; zsnes2 = pkgsi686Linux.callPackage ../applications/emulators/zsnes/2.x.nix { }; - ### APPLICATIONS/EMULATORS/BSNES - - ### APPLICATIONS/EMULATORS/DOLPHIN-EMU - - dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix { - inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - }; - ### APPLICATIONS/EMULATORS/RETROARCH libretro = recurseIntoAttrs (callPackage ../applications/emulators/libretro { });