summaryrefslogtreecommitdiffstats
path: root/pkgs/applications/emulators/dolphin-emu
diff options
context:
space:
mode:
authorMartino Fontana <tinozzo123@tutanota.com>2023-01-12 22:35:27 +0100
committerMartino Fontana <tinozzo123@tutanota.com>2023-01-12 22:35:27 +0100
commit6ca0697f8f18c27e8be40b17d8f795329a9d490e (patch)
treea1b9b3d196b84527ff274239c733faaaea0b013b /pkgs/applications/emulators/dolphin-emu
parent78fa1556b912cfc270f6d8e182616edd631095a4 (diff)
dolphin-emu-beta: 5.0-17269 -> 5.0-17995
Diffstat (limited to 'pkgs/applications/emulators/dolphin-emu')
-rw-r--r--pkgs/applications/emulators/dolphin-emu/master.nix12
1 files changed, 8 insertions, 4 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix
index 17a3049ea4f0..83da181f24b4 100644
--- a/pkgs/applications/emulators/dolphin-emu/master.nix
+++ b/pkgs/applications/emulators/dolphin-emu/master.nix
@@ -23,6 +23,7 @@
, mbedtls_2
, soundtouch
, sfml
+, minizip-ng
, xz
, hidapi
, fmt_8
@@ -52,13 +53,13 @@
stdenv.mkDerivation rec {
pname = "dolphin-emu";
- version = "5.0-17269";
+ version = "5.0-17995";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
- rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c";
- sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg=";
+ rev = "8bad821019721b9b72701b495da95656ace5fea5";
+ sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8=";
fetchSubmodules = true;
};
@@ -93,6 +94,7 @@ stdenv.mkDerivation rec {
mbedtls_2
soundtouch
sfml
+ minizip-ng
xz
qtbase
fmt_8
@@ -131,10 +133,12 @@ stdenv.mkDerivation rec {
];
qtWrapperArgs = lib.optionals stdenv.isLinux [
- "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}"
+ "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
# https://bugs.dolphin-emu.org/issues/11807
# The .desktop file should already set this, but Dolphin may be launched in other ways
"--set QT_QPA_PLATFORM xcb"
+ # https://bugs.dolphin-emu.org/issues/12913
+ "--set QT_XCB_NO_XI2 1"
];
# Use nix-provided libraries instead of submodules