pyrox.dev
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
+10
-1
pkgs/applications/window-managers/matchbox/default.nix
+10
-1
pkgs/applications/window-managers/matchbox/default.nix
···
1
-
{ lib, stdenv, fetchurl, pkg-config, libmatchbox, libX11, libXext }:
2
3
stdenv.mkDerivation rec {
4
pname = "matchbox";
···
12
url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
13
sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
14
};
15
16
meta = {
17
description = "X window manager for non-desktop embedded systems";
···
1
+
{ lib, stdenv, fetchurl, fetchpatch, pkg-config, libmatchbox, libX11, libXext }:
2
3
stdenv.mkDerivation rec {
4
pname = "matchbox";
···
12
url = "https://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${version}/matchbox-window-manager-${version}.tar.bz2";
13
sha256 = "1zyfq438b466ygcz78nvsmnsc5bhg4wcfnpxb43kbkwpyx53m8l1";
14
};
15
+
16
+
patches = [
17
+
# Pull upstream fix for -fno-common tollchains:
18
+
(fetchpatch {
19
+
name = "fno-common.patch";
20
+
url = "https://git.yoctoproject.org/matchbox-window-manager/patch/?id=844f61069896fe3f549ab425d731c061028f697c";
21
+
sha256 = "1md2s7q094hn4gzg21pfyz8d426y07d5rbx2icas9nvc8jj7bwfc";
22
+
})
23
+
];
24
25
meta = {
26
description = "X window manager for non-desktop embedded systems";