From 07c81867c90727082b8fa1c25b0e60a49ecb00fd Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Sun, 20 Oct 2024 18:33:02 +0200 Subject: [PATCH] dolphin-emu-primehack: 1.0.6a -> 1.0.7a, qt5 -> qt6, unpin fmt https://github.com/shiiion/dolphin/releases/tag/1.0.7a --- pkgs/applications/emulators/dolphin-emu/primehack.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 3 +-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/primehack.nix b/pkgs/applications/emulators/dolphin-emu/primehack.nix index c35700856b60..9872a1bffdc7 100644 --- a/pkgs/applications/emulators/dolphin-emu/primehack.nix +++ b/pkgs/applications/emulators/dolphin-emu/primehack.nix @@ -5,6 +5,7 @@ , cmake , wrapQtAppsHook , qtbase +, qtsvg , bluez , ffmpeg , libao @@ -48,13 +49,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu-primehack"; - version = "1.0.6a"; + version = "1.0.7a"; src = fetchFromGitHub { owner = "shiiion"; repo = "dolphin"; rev = version; - hash = "sha256-gc4+ofoLKR+cvm+SaWEnGaKrSjWMKq7pF6pEIi75Rtk="; + hash = "sha256-vuTSXQHnR4HxAGGiPg5tUzfiXROU3+E9kyjH+T6zVmc="; fetchSubmodules = true; }; @@ -93,6 +94,7 @@ stdenv.mkDerivation rec { fmt xz qtbase + qtsvg ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez udev diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab4e0b8b7236..1402a18c8d3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2672,9 +2672,8 @@ with pkgs; inherit (darwin) moltenvk; }; - dolphin-emu-primehack = qt5.callPackage ../applications/emulators/dolphin-emu/primehack.nix { + dolphin-emu-primehack = qt6.callPackage ../applications/emulators/dolphin-emu/primehack.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL; - fmt = fmt_8; }; ### APPLICATIONS/EMULATORS/RETROARCH