pyrox.dev / nixpkgs
lol
fork atom

lcdproc: pull upstream fix for fno-common toolchains

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

ld: iface.o:(.bss+0x0): multiple definition of `iface'; main.o:(.bss+0x60): first defined here

Sergei Trofimovich 578e075e 09692a45

+9
unified split
+9
pkgs/servers/monitoring/lcdproc/default.nix
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 , autoreconfHook 5 , makeWrapper 6 , pkg-config ··· 27 28 patches = [ 29 ./hardcode_mtab.patch 30 ]; 31 32 # we don't need to see the GPL every time we launch lcdd in the foreground
··· 1 { lib 2 , stdenv 3 , fetchFromGitHub 4 + , fetchpatch 5 , autoreconfHook 6 , makeWrapper 7 , pkg-config ··· 28 29 patches = [ 30 ./hardcode_mtab.patch 31 + 32 + # Pull upstream fix for -fno-common toolchains: 33 + # https://github.com/lcdproc/lcdproc/pull/148 34 + (fetchpatch { 35 + name = "fno-common.patch"; 36 + url = "https://github.com/lcdproc/lcdproc/commit/fda5302878692da933dc03cd011f8ddffefa07a4.patch"; 37 + sha256 = "0ld6p1r4rjsnjr63afw3lp5lx25jxjs07lsp9yc3q96r91r835cy"; 38 + }) 39 ]; 40 41 # we don't need to see the GPL every time we launch lcdd in the foreground