lol

dolphinEmuMaster: 20150802 -> 20170705

removed a substitution that is no longer needed, add new
dependencies, and use fetchFromGitHub instead of fetchgit

+11 -17
+11 -17
pkgs/misc/emulators/dolphin-emu/master.nix
··· 1 1 { stdenv, gcc, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib 2 - , gettext, git, libpthreadstubs, libXrandr, libXext, readline 3 - , openal, libXdmcp, portaudio, fetchgit, libusb, libevdev 2 + , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline 3 + , openal, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev 4 4 , libpulseaudio ? null }: 5 5 6 6 stdenv.mkDerivation rec { 7 - name = "dolphin-emu-20150802"; 8 - src = fetchgit { 9 - url = git://github.com/dolphin-emu/dolphin.git; 10 - rev = "5097a22844b850b429872f4de390bd958b11a616"; 11 - sha256 = "09jx61cxvfimnq1snkv6w3m9qidrgp0j0w81c7pbkpmcwysz8xya"; 12 - fetchSubmodules = false; 7 + name = "dolphin-emu-20170705"; 8 + src = fetchFromGitHub { 9 + owner = "dolphin-emu"; 10 + repo = "dolphin"; 11 + rev = "29cc009706f133aac39ebaa7003d37555b926109"; 12 + sha256 = "0axd2z14lyqlaxrjssc0dkqnjdk3ccxh2fqrhya0jc2rsm8ighlz"; 13 13 }; 14 - 15 - postPatch = '' 16 - for f in Source/Core/VideoBackends/{Software,OGL}/RasterFont.{h,cpp}; do 17 - substituteInPlace "$f" --replace " CHAR_WIDTH " " CHARWIDTH " 18 - done 19 - ''; 20 14 21 15 cmakeFlags = '' 22 16 -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include ··· 27 21 28 22 enableParallelBuilding = true; 29 23 30 - buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib 31 - gettext libpthreadstubs libXrandr libXext readline openal 32 - libevdev git libXdmcp portaudio libusb libpulseaudio ]; 24 + buildInputs = [ gcc pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib pcre 25 + gettext libpthreadstubs libXrandr libXext libSM readline openal 26 + libevdev libXdmcp portaudio libusb libpulseaudio ]; 33 27 34 28 meta = { 35 29 homepage = http://dolphin-emu.org/;