From 076c670e2f7d8865ed40949dbf4ea7b653e6e284 Mon Sep 17 00:00:00 2001 From: Marcin Serwin Date: Sun, 2 Feb 2025 02:14:00 +0100 Subject: [PATCH] Fix building on aarch64-linux --- .../by-name/to/torzu/fix-aarch64-linux-build.patch | 14 ++++++++++++++ pkgs/by-name/to/torzu/package.nix | 6 ++---- 2 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch diff --git a/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch b/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch new file mode 100644 index 000000000000..11d4a0a4ea2d --- /dev/null +++ b/pkgs/by-name/to/torzu/fix-aarch64-linux-build.patch @@ -0,0 +1,14 @@ +diff --git a/src/video_core/host1x/vic.cpp b/src/video_core/host1x/vic.cpp +index 3ad56bb80..57e6adbf8 100644 +--- a/src/video_core/host1x/vic.cpp ++++ b/src/video_core/host1x/vic.cpp +@@ -13,7 +13,8 @@ + #endif + #elif defined(ARCHITECTURE_arm64) + #pragma GCC diagnostic push +-#pragma GCC diagnostic ignored "-Wimplicit-int-conversion" ++#pragma GCC diagnostic ignored "-Wconversion" ++#pragma GCC diagnostic ignored "-Wshadow" + #include + #pragma GCC diagnostic pop + #endif diff --git a/pkgs/by-name/to/torzu/package.nix b/pkgs/by-name/to/torzu/package.nix index 630edceb8122..e51be62e37d4 100644 --- a/pkgs/by-name/to/torzu/package.nix +++ b/pkgs/by-name/to/torzu/package.nix @@ -98,6 +98,8 @@ stdenv.mkDerivation (finalAttrs: { ./fix-udp-protocol.patch # Use specific boost::asio includes and update to modern io_context ./fix-udp-client.patch + # Updates suppressed diagnostics + ./fix-aarch64-linux-build.patch ]; nativeBuildInputs = [ @@ -215,10 +217,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://notabug.org/litucks/torzu"; mainProgram = "yuzu"; platforms = lib.platforms.linux; - badPlatforms = [ - # Several conversion errors, probably caused by the update to GCC 14 - "aarch64-linux" - ]; maintainers = with lib.maintainers; [ liberodark ]; license = with lib.licenses; [ gpl3Plus