diff options
| author | 7c6f434c <7c6f434c@mail.ru> | 2022-06-08 11:47:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-08 11:47:25 +0000 |
| commit | 8671b69d2d9cd174c9ba77f257def5444d3f735c (patch) | |
| tree | 51333eab217b3efb60f5cf8a86f19909a87b7165 /pkgs | |
| parent | 1514e060293beb4f646c9989cf588ac3df786468 (diff) | |
| parent | 364e63d1640edc7abeac8ac44bd86cc806f9f33b (diff) | |
Merge pull request #176851 from trofi/workaround-fno-common-for-fbpanel
fbpanel: add -fcommon workaround
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/window-managers/fbpanel/default.nix | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/applications/window-managers/fbpanel/default.nix b/pkgs/applications/window-managers/fbpanel/default.nix index 1a87f29f67cd9..33a313eb8eec5 100644 --- a/pkgs/applications/window-managers/fbpanel/default.nix +++ b/pkgs/applications/window-managers/fbpanel/default.nix @@ -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; { |