diff options
| author | ash lea <ashlea@protonmail.com> | 2019-08-21 23:30:00 -0700 |
|---|---|---|
| committer | Cray Elliott <MP2E@archlinux.us> | 2019-08-23 02:41:36 -0700 |
| commit | 4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd (patch) | |
| tree | 5ec1634727ef8200059e95e1e62c021c1722a210 /pkgs/misc/emulators | |
| parent | 19094ee62ae21d5afac5978929616eae034aa813 (diff) | |
| download | nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar.gz nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar.bz2 nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar.lz nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar.xz nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.tar.zst nixlib-4a7992d2b89df5c3f65e1065ab7ceab1f0f19fdd.zip | |
dolphinEmu: fix build
Diffstat (limited to 'pkgs/misc/emulators')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/default.nix | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 392f5618b6e5..269fc1c527bf 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,6 +1,6 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined -, gettext, libpthreadstubs, libXrandr, libXext, readline, openal -, libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev +{ stdenv, fetchpatch, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib +, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline +, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml , libpulseaudio ? null }: @@ -15,17 +15,26 @@ stdenv.mkDerivation rec { sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; + patches = [ + # Fix build with soundtouch 2.1.2 + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/dolphin-emu/raw/a1b91fdf94981e12c8889a02cba0ec2267d0f303/f/dolphin-emu-5.0-soundtouch-exception-fix.patch"; + name = "dolphin-emu-5.0-soundtouch-exception-fix.patch"; + sha256 = "0yd3l46nja5qiknnl30ryad98f3v8911jwnr67hn61dzx2kwbbaw"; + }) + ]; + postPatch = '' substituteInPlace Source/Core/VideoBackends/OGL/RasterFont.cpp \ --replace " CHAR_WIDTH " " CHARWIDTH " ''; - cmakeFlags = '' - -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include - -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include - -DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0 - -DENABLE_LTO=True - ''; + cmakeFlags = [ + "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include" + "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include" + "-DGTK2_INCLUDE_DIRS=${gtk2.dev}/include/gtk-2.0" + "-DENABLE_LTO=True" + ]; enableParallelBuilding = true; |