summaryrefslogtreecommitdiffstats
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-01-21 12:44:13 +0000
committerGitHub <noreply@github.com>2021-01-21 12:44:13 +0000
commit7d8010697831d92aa26d6de42b24c3a4fd80a253 (patch)
tree1b80a5fec032b012c4922c09216e763f5e583d51 /pkgs/misc/emulators
parente48b0ede04e07de95a7974a7829f9ae4ffd1a334 (diff)
parentb8c9ed0b4212c282eaa79f94405e327edd11e61f (diff)
Merge staging-next into staging
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 7e988747308c..4a1fca0e7c5c 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -21,13 +21,13 @@ let
};
in stdenv.mkDerivation rec {
pname = "dolphin-emu";
- version = "5.0-12716";
+ version = "5.0-13178";
src = fetchFromGitHub {
owner = "dolphin-emu";
repo = "dolphin";
- rev = "31524288e3b2450eaefff8202c6d26c4ba3f7333";
- sha256 = "0vv3ahk6zdx2hx5diq4jkhl289wjybqcr4lwinrkfiywb83hcabg";
+ rev = "a34823df61df65168aa40ef5e82e44defd4a0138";
+ sha256 = "0j6hnj60iai366kl0kdbn1jkwc183l02g65mp2vq4qb2yd4399l1";
};
nativeBuildInputs = [ cmake pkg-config ]