pyrox.dev / nixpkgs
lol
fork atom

Merge pull request #210428 from SuperSamus/dolphin-emu

dolphin-emu-beta: 5.0-17269 -> 5.0-17995

authored by

Pierre Bourdon and committed by
GitHub 5acf84a5 890c2432

+9 -5
unified split
+8 -4
pkgs/applications/emulators/dolphin-emu/master.nix
··· 23 , mbedtls_2 24 , soundtouch 25 , sfml 26 , xz 27 , hidapi 28 , fmt_8 ··· 52 53 stdenv.mkDerivation rec { 54 pname = "dolphin-emu"; 55 - version = "5.0-17269"; 56 57 src = fetchFromGitHub { 58 owner = "dolphin-emu"; 59 repo = "dolphin"; 60 - rev = "48c9c224cf9f82f0f9f2690b7cc6283d7448480c"; 61 - sha256 = "sha256-WC3jukRygZigLx987CzRmOmJ7DeS1atXrMzU98sRzEg="; 62 fetchSubmodules = true; 63 }; 64 ··· 93 mbedtls_2 94 soundtouch 95 sfml 96 xz 97 qtbase 98 fmt_8 ··· 131 ]; 132 133 qtWrapperArgs = lib.optionals stdenv.isLinux [ 134 - "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [vulkan-loader]}" 135 # https://bugs.dolphin-emu.org/issues/11807 136 # The .desktop file should already set this, but Dolphin may be launched in other ways 137 "--set QT_QPA_PLATFORM xcb" 138 ]; 139 140 # Use nix-provided libraries instead of submodules
··· 23 , mbedtls_2 24 , soundtouch 25 , sfml 26 + , minizip-ng 27 , xz 28 , hidapi 29 , fmt_8 ··· 53 54 stdenv.mkDerivation rec { 55 pname = "dolphin-emu"; 56 + version = "5.0-17995"; 57 58 src = fetchFromGitHub { 59 owner = "dolphin-emu"; 60 repo = "dolphin"; 61 + rev = "8bad821019721b9b72701b495da95656ace5fea5"; 62 + sha256 = "sha256-uxHzn+tXRBr11OPpZ4ELBw7DTJH4mnqUBOeyPlXNAh8="; 63 fetchSubmodules = true; 64 }; 65 ··· 94 mbedtls_2 95 soundtouch 96 sfml 97 + minizip-ng 98 xz 99 qtbase 100 fmt_8 ··· 133 ]; 134 135 qtWrapperArgs = lib.optionals stdenv.isLinux [ 136 + "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}" 137 # https://bugs.dolphin-emu.org/issues/11807 138 # The .desktop file should already set this, but Dolphin may be launched in other ways 139 "--set QT_QPA_PLATFORM xcb" 140 + # https://bugs.dolphin-emu.org/issues/12913 141 + "--set QT_XCB_NO_XI2 1" 142 ]; 143 144 # Use nix-provided libraries instead of submodules
+1 -1
pkgs/top-level/all-packages.nix
··· 2200 2201 dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; 2202 2203 - dolphin-emu-beta = qt5.callPackage ../applications/emulators/dolphin-emu/master.nix { 2204 inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; 2205 inherit (darwin) moltenvk; 2206 };
··· 2200 2201 dolphin-emu = callPackage ../applications/emulators/dolphin-emu { }; 2202 2203 + dolphin-emu-beta = qt6Packages.callPackage ../applications/emulators/dolphin-emu/master.nix { 2204 inherit (darwin.apple_sdk.frameworks) CoreBluetooth ForceFeedback IOKit OpenGL VideoToolbox; 2205 inherit (darwin) moltenvk; 2206 };