alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Pull requests Activity

bump dolphinEmuMaster, remove no longer needed SDL dep

Browse source 
also add libevdev as a dep, read about all the changes at
https://dolphin-emu.org/blog/2015/08/01/dolphin-progress-report-july-2015/
This commit is contained in:
Cray Elliott 2015-08-02 03:17:03 -07:00
parent 179cdbc62c
commit 84dc71ebe4
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib { stdenv, gcc5, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib
, gettext, git, libpthreadstubs, libXrandr, libXext, readline , gettext, git, libpthreadstubs, libXrandr, libXext, readline
, openal, libXdmcp, portaudio, SDL, fetchgit, libusb , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev
, libpulseaudio ? null }: , libpulseaudio ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dolphin-emu-20150609"; name = "dolphin-emu-20150802";
src = fetchgit { src = fetchgit {
url = git://github.com/dolphin-emu/dolphin.git; url = git://github.com/dolphin-emu/dolphin.git;
rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695"; rev = "5097a22844b850b429872f4de390bd958b11a616";
sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r"; sha256 = "1qizkahbimpmgjs51av1cdmnnyvbz0j0gknmi5vdc38vrzxvwkrf";
fetchSubmodules = false; fetchSubmodules = false;
}; };
@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib buildInputs = [ gcc5 pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib
gettext libpthreadstubs libXrandr libXext readline openal gettext libpthreadstubs libXrandr libXext readline openal
git libXdmcp portaudio SDL libusb libpulseaudio ]; libevdev git libXdmcp portaudio libusb libpulseaudio ];
meta = { meta = {
homepage = http://dolphin-emu.org/; homepage = http://dolphin-emu.org/;