summary refs log tree commit diff
path: root/pkgs/misc/emulators
diff options
context:
space:
mode:
authorCray Elliott <MP2E@archlinux.us>2015-04-21 20:40:32 -0700
committerCray Elliott <MP2E@archlinux.us>2015-04-21 20:40:32 -0700
commit56de3acd5a0fa09ec7854b058c923546f5be04a1 (patch)
treec62477362fc1425f8cf0277118cb0284e3eeca4f /pkgs/misc/emulators
parente73921aee13294ef43075affbf2b10e3e66c9a4a (diff)
downloadnixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar.gz
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar.bz2
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar.lz
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar.xz
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.tar.zst
nixlib-56de3acd5a0fa09ec7854b058c923546f5be04a1.zip
dolphinEmuMaster: add libusb to depends, bump git version
this allows dolphin-emu to detect and use the Nintendo Wii U Gamecube Adapter
Diffstat (limited to 'pkgs/misc/emulators')
-rw-r--r--pkgs/misc/emulators/dolphin-emu/master.nix10
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index 640d8f4fe6c5..cbff76610f1c 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -1,14 +1,14 @@
 { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
 , gettext, git, libpthreadstubs, libXrandr, libXext, readline
-, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit
+, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit, libusb
 , pulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20150403";
+  name = "dolphin-emu-20150421";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "38236fb8e8370f9f1ca1482ffa94b08c4595f2aa";
-    sha256 = "14v86c042jz5adqk6ngqbzl5xna7m69i39y7q23s7h6ra75461yf";
+    rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5";
+    sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d";
     fetchSubmodules = false;
   };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
-                  git libXdmcp portaudio SDL wxGTK30 pulseaudio ];
+                  git libXdmcp portaudio SDL wxGTK30 libusb pulseaudio ];
 
   meta = {
     homepage = http://dolphin-emu.org/;