From 9fe56e52dda8d99a91d56fbc420976a040c2de61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 21 Feb 2017 18:52:29 +0100 Subject: [PATCH] dolphinEmu*: fixup build with glibc-2.25 --- pkgs/misc/emulators/dolphin-emu/default.nix | 5 +++++ pkgs/misc/emulators/dolphin-emu/master.nix | 6 ++++++ 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index bb5b12038f83..db510024241d 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -14,6 +14,11 @@ stdenv.mkDerivation rec { sha256 = "07mlfnh0hwvk6xarcg315x7z2j0qbg9g7cm040df9c8psiahc3g6"; }; + 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 diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index 990870d35d69..499e1177c3ea 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -12,6 +12,12 @@ stdenv.mkDerivation rec { fetchSubmodules = false; }; + postPatch = '' + for f in Source/Core/VideoBackends/{Software,OGL}/RasterFont.{h,cpp}; do + substituteInPlace "$f" --replace " CHAR_WIDTH " " CHARWIDTH " + done + ''; + cmakeFlags = '' -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include