From 545f8e8c6c98c06c964205739af0cc23038aed1d Mon Sep 17 00:00:00 2001
From: Cray Elliott <MP2E@archlinux.us>
Date: Sun, 2 Nov 2014 00:08:46 -0700
Subject: [PATCH] monthly bump of dolphinEmuMaster

also dolphinEmu and dolphinEmuMaster had an extraneous stdenv removed
from buildInputs
---
 pkgs/misc/emulators/dolphin-emu/default.nix | 2 +-
 pkgs/misc/emulators/dolphin-emu/master.nix  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix
index bf03e1e52aa9..8028498d6690 100644
--- a/pkgs/misc/emulators/dolphin-emu/default.nix
+++ b/pkgs/misc/emulators/dolphin-emu/default.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+  buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
                   libXdmcp portaudio SDL wxGTK30 pulseaudio ];
 
diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix
index cf7cd5416901..b4f459d671cb 100644
--- a/pkgs/misc/emulators/dolphin-emu/master.nix
+++ b/pkgs/misc/emulators/dolphin-emu/master.nix
@@ -4,11 +4,11 @@
 , pulseaudio ? null }:
 
 stdenv.mkDerivation rec {
-  name = "dolphin-emu-20141002";
+  name = "dolphin-emu-20141101";
   src = fetchgit {
     url = git://github.com/dolphin-emu/dolphin.git;
-    rev = "ed7f0739ae31c07c31d013964986c549317aba6e";
-    sha256 = "01qwlkh3c0ij97zycq0v4kclxmnlbwcc1bmvjzl4cbczhxbbx4hk";
+    rev = "9daaf94f3c8caf71dab16c7e591ce7905c1416c4";
+    sha256 = "1n71by34mrgdxcr8c5bsbpy9azi62512knp5sjgzq6sfwzgy40d8";
     fetchSubmodules = false;
   };
 
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
+  buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
                   gettext libpthreadstubs libXrandr libXext readline openal
                   git libXdmcp portaudio SDL wxGTK30 pulseaudio ];