summary refs log tree commit diff
path: root/pkgs
diff options
context:
space:
mode:
authorLuke Adams <luke.adams@belljar.io>2017-11-11 13:46:20 -0600
committerCray Elliott <MP2E@archlinux.us>2017-12-23 22:31:15 -0800
commit5379bb4def4b3b655e69a501646661c240211f05 (patch)
treef1f2bcaa054cdda6b54c5d5832663adac26acf5f /pkgs
parent18a1943ad80163a1d595ad7652728be5f51c1b7e (diff)
downloadnixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar.gz
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar.bz2
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar.lz
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar.xz
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.tar.zst
nixpkgs-5379bb4def4b3b655e69a501646661c240211f05.zip
dolphinEmuMaster: 20170902 -> 20171218
Diffstat (limited to 'pkgs')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix7
1 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index f6030700d2d..c18a63f720d 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -20,12 +20,12 @@ assert dolphin-wxgui || dolphin-qtgui;
 assert !(dolphin-wxgui && dolphin-qtgui);
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20170902";
+  name = "dolphin-emu-20171218";
   src = fetchFromGitHub {
     owner = "dolphin-emu";
     repo = "dolphin";
-    rev = "b073db51e5f3df8c9890e09a3f4f8a2276c31e3f";
-    sha256 = "0pr5inkd7swc6s7im7axhvmkdbqidhrha2wpflnr25aiwq0dzm10";
+    rev = "438e8b64a4b080370c7a65ed23af52838a4e7aaa";
+    sha256 = "0rrd0g1vg9jk1p4wdr6w2z34cabb7pgmpwfcl2a372ark3vi4ysc";
   };
 
   cmakeFlags = [
@@ -64,6 +64,7 @@ stdenv.mkDerivation rec {
     description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM";
     license = stdenv.lib.licenses.gpl2;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    branch = "master";
     # x86_32 is an unsupported platform.
     # Enable generic build if you really want a JIT-less binary.
     platforms = [ "x86_64-linux" "x86_64-darwin" ];