Merge pull request #176851 from trofi/workaround-fno-common-for-fbpanel

fbpanel: add -fcommon workaround
This commit is contained in:
7c6f434c 2022-06-08 11:47:25 +00:00 committed by GitHub
commit 8671b69d2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -19,6 +19,10 @@ stdenv.mkDerivation rec {
--replace "CFLAGSX =" "CFLAGSX = -I${gdk-pixbuf-xlib.dev}/include/gdk-pixbuf-2.0"
'';
# Workaround build failure on -fno-common toolchains like upstream
# gcc-10. Otherwise build fails as:
# ld: plugin.o:(.bss+0x0): multiple definition of `stam'; panel.o:(.bss+0x20): first defined here
NIX_CFLAGS_COMPILE = "-fcommon";
NIX_LDFLAGS="-lX11";
meta = with lib; {