mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 12:42:24 +00:00
Code Issues Wiki Activity

bump dolphinEmuMaster, now needs gcc5 to compile

Browse source 
also removed wxGTK30 as that was unnecessary, and actually causes compilation errors with gcc5 in the mix
This commit is contained in:
Cray Elliott 2015-06-09 03:24:18 -07:00
parent 253d30b986
commit e7c2a58250
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,14 +1,14 @@
{ stdenv, 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, wxGTK30, fetchgit, libusb , openal, libXdmcp, portaudio, SDL, fetchgit, libusb
, libpulseaudio ? null }: , libpulseaudio ? null }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "dolphin-emu-20150421"; name = "dolphin-emu-20150609";
src = fetchgit { src = fetchgit {
url = git://github.com/dolphin-emu/dolphin.git; url = git://github.com/dolphin-emu/dolphin.git;
rev = "4340927b7f17fa43c5f6c0f204c4bfc2b17a47d5"; rev = "e47e4c677ad22895f8c8bc78676dd295e36f2695";
sha256 = "0pc18n88yckmvli27p09xj5kyv4k8bqv92ric8xvi7cqznmmiv9d"; sha256 = "0g176x0rw9lssw68alr83cakldq1q38mzjwxdaf524bkvnn7fl3r";
fetchSubmodules = false; fetchSubmodules = false;
}; };
@ -22,9 +22,9 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
buildInputs = [ 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 wxGTK30 libusb libpulseaudio ]; git libXdmcp portaudio SDL libusb libpulseaudio ];
meta = { meta = {
homepage = http://dolphin-emu.org/; homepage = http://dolphin-emu.org/;