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

trinity: pull upstream fix for -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-06-05 20:48:56 +01:00
parent 49c4223e98
commit 417ae79c26
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/os-specific/linux/trinity/default.nix
View file

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub }:
{ lib, stdenv, fetchFromGitHub, fetchpatch }:
stdenv.mkDerivation rec {
pname = "trinity";
@ -11,6 +11,15 @@ stdenv.mkDerivation rec {
sha256 = "0z1a7x727xacam74jccd223k303sllgwpq30lnq9b6xxy8b659bv";
};
patches = [
# Pull upstream fix for -fno-common toolchains
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/kernelslacker/trinity/commit/e53e25cc8dd5bdb5f7d9b4247de9e9921eec81d8.patch";
sha256 = "0dbhyc98x11cmac6rj692zymnfqfqcbawlrkg1lhgfagzjxxwshg";
})
];
postPatch = ''
patchShebangs configure
patchShebangs scripts