diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-02-21 18:52:29 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-02-21 19:03:36 +0100 |
| commit | 9fe56e52dda8d99a91d56fbc420976a040c2de61 (patch) | |
| tree | 55699bb95915a2bc24a59bccb843253eae4b9517 /pkgs/misc | |
| parent | c986f4f8949213c636c4f632e31b2ef0e9278054 (diff) | |
dolphinEmu*: fixup build with glibc-2.25
Diffstat (limited to 'pkgs/misc')
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/misc/emulators/dolphin-emu/master.nix | 6 |
2 files changed, 11 insertions, 0 deletions
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 |