From 3286faa7e5e4ee65468521cf61d0da654dd2890b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Tue, 17 May 2022 16:57:10 +0100 Subject: [PATCH] matchbox: pull upstream fix fo -fno-common toolchains Without thce change build fails on upstream gcc-10 as: ld: mbtheme.o:/build/matchbox-window-manager-1.2/src/structs.h:229: multiple definition of `MBAtomEnum'; main.o:/build/matchbox-window-manager-1.2/src/structs.h:229: first defined here --- .../applications/window-managers/matchbox/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/matchbox/default.nix b/pkgs/applications/window-managers/matchbox/default.nix index 51bb3010d33..f12ed0ea0a7 100644 --- a/pkgs/applications/window-managers/matchbox/default.nix +++ b/pkgs/applications/window-managers/matchbox/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }: +{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libmatchbox, libX11, libXext }: stdenv.mkDerivation rec { pname = "matchbox"; @@ -13,6 +13,15 @@ stdenv.mkDerivation rec { sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1"; }; + patches = [ + # Pull upstream fix for -fno-common tollchains: + (fetchpatch { + name = "fno-common.patch"; + url = "https://git.yoctoproject.org/matchbox-window-manager/patch/?id=844f61069896fe3f549ab425d731c061028f697c"; + sha256 = "1md2s7q094hn4gzg21pfyz8d426y07d5rbx2icas9nvc8jj7bwfc"; + }) + ]; + meta = { description = "X window manager for non-desktop embedded systems"; homepage = "https://www.yoctoproject.org/software-item/matchbox/";