Merge pull request #173122 from trofi/workaround-fno-common-for-iftop
iftop: add -fcommon workaround
This commit is contained in:
commit
358aff4527
1 changed files with 6 additions and 0 deletions
|
@ -19,6 +19,12 @@ stdenv.mkDerivation rec {
|
||||||
|
|
||||||
buildInputs = [ncurses libpcap];
|
buildInputs = [ncurses libpcap];
|
||||||
|
|
||||||
|
# Workaround build failure on -fno-common toolchains like upstream
|
||||||
|
# gcc-10. Otherwise build fails as:
|
||||||
|
# ld: tui.o:/build/iftop-1.0pre4/ui_common.h:41: multiple definition of `service_hash';
|
||||||
|
# iftop.o:/build/iftop-1.0pre4/ui_common.h:41: first defined here
|
||||||
|
NIX_CFLAGS_COMPILE = "-fcommon";
|
||||||
|
|
||||||
passthru.tests = { inherit (nixosTests) iftop; };
|
passthru.tests = { inherit (nixosTests) iftop; };
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
|
|
Loading…
Reference in a new issue