cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #210428 from SuperSamus/dolphin-emu

Browse source 
dolphin-emu-beta: 5.0-17269 -> 5.0-17995
This commit is contained in:
Pierre Bourdon 2023-01-21 12:21:04 +01:00 committed by GitHub
commit 5acf84a5ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
pkgs/applications/emulators/dolphin-emu/master.nix
View file

@ -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

2
pkgs/top-level/all-packages.nix
View file

@ -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;
};