diff options
| author | Pierre Bourdon <delroth@gmail.com> | 2023-01-21 12:21:04 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-01-21 12:21:04 +0100 |
| commit | 5acf84a5abb68a02cc8855343876611c6d7b6043 (patch) | |
| tree | 772e2fb9a9b01d61f6d0e6e0eeaf79e170f2d50c /pkgs | |
| parent | 890c243231304bc0d2c0daa1260f272507a10d24 (diff) | |
| parent | 6ca0697f8f18c27e8be40b17d8f795329a9d490e (diff) | |
| download | nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar.gz nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar.bz2 nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar.lz nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar.xz nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.tar.zst nixpkgs-5acf84a5abb68a02cc8855343876611c6d7b6043.zip | |
Merge pull request #210428 from SuperSamus/dolphin-emu
dolphin-emu-beta: 5.0-17269 -> 5.0-17995
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/emulators/dolphin-emu/master.nix | 12 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 17a3049ea4f..83da181f24b 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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e072453f0c9..6e8a545d898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2200,7 +2200,7 @@ with pkgs; dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; - dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { + dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; inherit (darwin) moltenvk; }; |