From 1f72b75ff5a63c4f5758b58f4c7f441d024fd0e8 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sun, 1 Dec 2024 21:17:39 +0800 Subject: [PATCH] blackbox-terminal: Fix build with GCC 14 Otherwise fails with: error: 'return' with a value, in function returning void [-Wreturn-mismatch] Tested with gcc14Stdenv. --- pkgs/by-name/bl/blackbox-terminal/package.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/by-name/bl/blackbox-terminal/package.nix b/pkgs/by-name/bl/blackbox-terminal/package.nix index 2aa523987623..c1323a89c031 100644 --- a/pkgs/by-name/bl/blackbox-terminal/package.nix +++ b/pkgs/by-name/bl/blackbox-terminal/package.nix @@ -44,6 +44,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/3978c9b666d27adba835dd47cf55e21515b6d6d9.patch"; hash = "sha256-L/Ci4YqYNzb3F49bUwEWSjzr03MIPK9A5FEJCCct+7A="; }) + + # Fix build with GCC 14 + # https://gitlab.gnome.org/GNOME/vala/-/merge_requests/369#note_1986032 + # https://gitlab.gnome.org/raggesilver/blackbox/-/merge_requests/143 + (fetchpatch { + url = "https://gitlab.gnome.org/raggesilver/blackbox/-/commit/2f45717f1c18f710d9b9fbf21830027c8f0794e7.patch"; + hash = "sha256-VlXttqOTbhD6Rp7ZODgsafOjeY+Lb5sZP277bC9ENXU="; + }) ]; postPatch = ''