From 255cfa731a7d12554e1dedb8bc78b653c0c19171 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 29 Nov 2022 00:03:05 +0100 Subject: [PATCH] desmume: unbreak on aarch64-linux --- pkgs/applications/emulators/desmume/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/desmume/default.nix b/pkgs/applications/emulators/desmume/default.nix index 5472069f4168..74f179324675 100644 --- a/pkgs/applications/emulators/desmume/default.nix +++ b/pkgs/applications/emulators/desmume/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , SDL2 , agg , alsa-lib @@ -32,6 +33,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; }; + patches = [ + # Fix compiling on GCC for AArch64 + (fetchpatch { + url = "https://github.com/TASEmulators/desmume/commit/24eb5ed95c6cbdaba8b3c63a99e95e899e8a5061.patch"; + hash = "sha256-J3ZRU1tPTl+4/jg0DBo6ro6DTUZkpQCey+QGF2EugCQ="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils intltool @@ -81,8 +90,5 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.gpl2Plus; maintainers = [ maintainers.AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isAarch64 && stdenv.isLinux; # ofborg failed }; }) -# TODO: investigate the patches -# TODO: investigate other platforms