cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

matchbox: pull upstream fix fo -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-05-17 16:57:10 +01:00
parent 115f2f7878
commit 3286faa7e5
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
pkgs/applications/window-managers/matchbox/default.nix
View file

@ -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/";