From 58c6135aa8095b8c474dd631af939e9426166826 Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Fri, 27 Dec 2024 22:01:49 -0500 Subject: [PATCH] lxsession: fix build with gcc 14 --- pkgs/desktops/lxde/core/lxsession/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/lxde/core/lxsession/default.nix b/pkgs/desktops/lxde/core/lxsession/default.nix index 74e49b6bb273..ab6b77429d9a 100644 --- a/pkgs/desktops/lxde/core/lxsession/default.nix +++ b/pkgs/desktops/lxde/core/lxsession/default.nix @@ -1,6 +1,7 @@ { lib, stdenv, + fetchpatch, fetchFromGitHub, autoconf, automake, @@ -28,7 +29,17 @@ stdenv.mkDerivation rec { sha256 = "17sqsx57ymrimm5jfmcyrp7b0nzi41bcvpxsqckmwbhl19g6c17d"; }; - patches = [ ./xmlcatalog_patch.patch ]; + patches = [ + ./xmlcatalog_patch.patch + + # lxsession compilation is broken upstream as of GCC 14 + # https://sourceforge.net/p/lxde/bugs/973/ + (fetchpatch { + name = "0001-Fix-build-on-GCC-14.patch"; + url = "https://sourceforge.net/p/lxde/bugs/973/attachment/0001-Fix-build-on-GCC-14.patch"; + hash = "sha256-lxF3HZy5uLK7Cfu8W1A03syZf7OWXpHiU2Fk+xBl39g="; + }) + ]; nativeBuildInputs = [ autoconf