swendel/nixpkgs
1
0
Fork 0
mirror of https://github.com/SebastianWendel/nixpkgs.git synced 2024-09-21 12:59:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

monthly bump of dolphinEmuMaster

Browse source 
also dolphinEmu and dolphinEmuMaster had an extraneous stdenv removed
from buildInputs
This commit is contained in:
Cray Elliott 2014-11-02 00:08:46 -07:00
parent 969349c975
commit 545f8e8c6c
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/misc/emulators/dolphin-emu/default.nix
View file

@ -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 ];

8
pkgs/misc/emulators/dolphin-emu/master.nix
View file

@ -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 ];