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
This commit is contained in:
parent
09692a459c
commit
578e075e1a
|
@ -1,6 +1,7 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
|
, fetchpatch
|
||||||
, autoreconfHook
|
, autoreconfHook
|
||||||
, makeWrapper
|
, makeWrapper
|
||||||
, pkg-config
|
, pkg-config
|
||||||
|
@ -27,6 +28,14 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
./hardcode_mtab.patch
|
./hardcode_mtab.patch
|
||||||
|
|
||||||
|
# Pull upstream fix for -fno-common toolchains:
|
||||||
|
# https://github.com/lcdproc/lcdproc/pull/148
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/lcdproc/lcdproc/commit/fda5302878692da933dc03cd011f8ddffefa07a4.patch";
|
||||||
|
sha256 = "0ld6p1r4rjsnjr63afw3lp5lx25jxjs07lsp9yc3q96r91r835cy";
|
||||||
|
})
|
||||||
];
|
];
|
||||||
|
|
||||||
# we don't need to see the GPL every time we launch lcdd in the foreground
|
# we don't need to see the GPL every time we launch lcdd in the foreground
|
||||||
|
|
Loading…
Reference in a new issue