pyrox.dev
kmscube: pull upstream fix for -fno-common toolchains
Without the change build against upstream gcc-10 fails as:
ld: kmscube-cube-tex.o:/build/kmscube-9dcce71/cube-tex.c:48: multiple definition of `gl';
kmscube-cube-smooth.o:/build/kmscube-9dcce71/cube-smooth.c:40: first defined here
+10
-1
pkgs/os-specific/linux/kmscube/default.nix
+10
-1
pkgs/os-specific/linux/kmscube/default.nix
···
1
-
{ lib, stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }:
2
3
stdenv.mkDerivation {
4
pname = "kmscube";
···
9
rev = "9dcce71e603616ee7a54707e932f962cdf8fb20a";
10
sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933";
11
};
12
13
nativeBuildInputs = [ autoreconfHook pkg-config ];
14
buildInputs = [ libdrm libX11 libGL mesa ];
···
1
+
{ lib, stdenv, fetchgit, fetchpatch, autoreconfHook, libdrm, libX11, libGL, mesa, pkg-config }:
2
3
stdenv.mkDerivation {
4
pname = "kmscube";
···
9
rev = "9dcce71e603616ee7a54707e932f962cdf8fb20a";
10
sha256 = "1q5b5yvyfj3127385mp1bfmcbnpnbdswdk8gspp7g4541xk4k933";
11
};
12
+
13
+
patches = [
14
+
# Pull upstream patch for -fno-common toolchains.
15
+
(fetchpatch {
16
+
name = "fno-common.patch";
17
+
url = "https://gitlab.freedesktop.org/mesa/kmscube/-/commit/908ef39864442c0807954af5d3f88a3da1a6f8a5.patch";
18
+
sha256 = "1gxn3b50mvjlc25234839v5z29r8fd9di4176a3yx4gbsz8cc5vi";
19
+
})
20
+
];
21
22
nativeBuildInputs = [ autoreconfHook pkg-config ];
23
buildInputs = [ libdrm libX11 libGL mesa ];