From fec76ff7881725053a8a0470db84f821579c2454 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 12 Jan 2025 22:35:02 +0000 Subject: [PATCH] spaceFM: fix `gcc-14` build WIthout the change the build on` master` fails as: https://hydra.nixos.org/build/282732531 exo/exo-icon-view.c: In function 'exo_icon_view_key_press_event': exo/exo-icon-view.c:2686:27: error: assignment to 'GdkWindow *' {aka 'struct _GdkWindow *'} from incompatible pointer type 'GObject *' {aka 'struct _GObject *'} [-Wincompatible-pointer-types-Wincompatible-pointer-types] 2686 | new_event->key.window = g_object_ref (G_OBJECT (gtk_widget_get_window (GTK_WIDGET(icon_view->priv->search_entry)))); | ^ --- pkgs/by-name/sp/spaceFM/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix index 418f285bd6cf..da44ad45380c 100644 --- a/pkgs/by-name/sp/spaceFM/package.nix +++ b/pkgs/by-name/sp/spaceFM/package.nix @@ -1,6 +1,7 @@ { pkgs, fetchFromGitHub, + fetchpatch, lib, stdenv, gtk3, @@ -35,6 +36,14 @@ stdenv.mkDerivation rec { # restrict GDK backends to only X11 ./x11-only.patch + + # gcc-14 build fix from: + # https://github.com/IgnorantGuru/spacefm/pull/816 + (fetchpatch { + name = "gcc-14.patch"; + url = "https://github.com/IgnorantGuru/spacefm/commit/98efb1f43e6339b3ceddb9f65ee85e26790fefdf.patch"; + hash = "sha256-dau1AMnSBsp8iDrjoo0WTnFQ13vNZW2kM4qz0B/beDI="; + }) ]; # Workaround build failure on -fno-common toolchains: