lol

xannotate: pull patch pending upstream inclusion for -fno-common toolchain support

Without the change build fails against upstream gcc-10 as:

ld: process.o:/build/source/src/process.h:26: multiple definition of
`child'; backend.o:/build/source/src/process.h:26: first defined here

+12 -2
+12 -2
pkgs/tools/X11/xannotate/default.nix
··· 1 - {lib, stdenv, fetchFromBitbucket, libX11}: 1 + {lib, stdenv, fetchFromBitbucket, fetchpatch, libX11}: 2 2 stdenv.mkDerivation rec { 3 3 pname = "xannotate"; 4 4 version = "20150301"; ··· 10 10 sha256 = "02jy19if0rnbxvs6b0l5mi9ifvdj2qmv0pv278v9kfs0kvir68ik"; 11 11 }; 12 12 13 + patches = [ 14 + # Pull patch pending upstream inclusion for -gno-common tollchains: 15 + # https://github.com/blais/xannotate/pull/1 16 + (fetchpatch { 17 + name = "fno-common.patch"; 18 + url = "https://github.com/blais/xannotate/commit/ee637e2dee103d0e654865c2202ea1b3af2a20d6.patch"; 19 + sha256 = "1lw22d5qs1bwp53l332yl3yypfvwrbi750wp7yv90nfn3ia0xhni"; 20 + }) 21 + ]; 22 + 13 23 buildInputs = [ libX11 ]; 14 24 15 25 meta = { ··· 17 27 license = lib.licenses.gpl2Plus ; 18 28 maintainers = [lib.maintainers.raskin]; 19 29 platforms = lib.platforms.linux; 20 - homepage = "https://bitbucket.org/blais/xannotate"; 30 + homepage = "https://github.com/blais/xannotate"; 21 31 }; 22 32 }