pyrox.dev
trinity: pull upstream fix for -fno-common toolchains
Without the change build fail on upstream gcc-10 as:
ld: trinity.o:include/logfile.h:8: multiple definition of
`mainlogfile'; child.o:include/logfile.h:8: first defined here
+10
-1
pkgs/os-specific/linux/trinity/default.nix
+10
-1
pkgs/os-specific/linux/trinity/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub }:
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
2
2
3
3
stdenv.mkDerivation rec {
4
4
pname = "trinity";
···
10
10
rev = "v${version}";
11
11
sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv";
12
12
};
13
+
14
+
patches = [
15
+
# Pull upstream fix for -fno-common toolchains
16
+
(fetchpatch {
17
+
name = "fno-common.patch";
18
+
url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch";
19
+
sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg";
20
+
})
21
+
];
13
22
14
23
postPatch = ''
15
24
patchShebangs configure