From 7129ebbd5e107be149d4af09f3da90094ec50b14 Mon Sep 17 00:00:00 2001 From: William Casarin Date: Sun, 26 Jun 2016 20:05:54 -0700 Subject: [PATCH] dolphin-emu: 4.0.2 -> 5.0 --- pkgs/misc/emulators/dolphin-emu/default.nix | 23 +++++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 749573f474a..bbd25f2b3de 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,13 +1,17 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib -, gettext, libpthreadstubs, libXrandr, libXext, readline -, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl +, gettext, libpthreadstubs, libXrandr, libXext, readline, openal +, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , libpulseaudio ? null }: stdenv.mkDerivation rec { - name = "dolphin-emu-4.0.2"; - src = fetchurl { - url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz; - sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89"; + name = "dolphin-emu-${version}"; + version = "5.0"; + + src = fetchFromGitHub { + owner = "dolphin-emu"; + repo = "dolphin"; + rev = version; + sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; cmakeFlags = '' @@ -22,14 +26,15 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - libXdmcp portaudio SDL wxGTK30 libpulseaudio ]; + libevdev libXdmcp portaudio libusb libpulseaudio ]; meta = { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; - broken = true; + # x86_32 is an unsupported platform. + # Enable generic build if you really want a JIT-less binary. + platforms = [ "x86_64-linux" ]; }; }