From 693bb5c17d72c934d9307bc6cf655869a02fd918 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 4 Jun 2022 07:26:09 +0100
Subject: [PATCH] junkie: pull upstream fix for -fno-common toolchains

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

    ld: proto/.libs/libproto.a(cap.o):/build/source/src/proto/../../src/pkt_source.h:54:
      multiple definition of `pkt_count'; main.o:/build/source/src/pkt_source.h:54: first defined here
---
 pkgs/tools/networking/junkie/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/junkie/default.nix b/pkgs/tools/networking/junkie/default.nix
index 58b35f2f53fa..39002f128159 100644
--- a/pkgs/tools/networking/junkie/default.nix
+++ b/pkgs/tools/networking/junkie/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub, pkg-config, libpcap, guile, openssl }:
+{ lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, libpcap, guile, openssl }:
 
 stdenv.mkDerivation rec {
   pname = "junkie";
@@ -10,6 +10,14 @@ stdenv.mkDerivation rec {
     rev = "v${version}";
     sha256 = "0kfdjgch667gfb3qpiadd2dj3fxc7r19nr620gffb1ahca02wq31";
   };
+  patches = [
+    # Pull upstream patch for -fno-common toolchains:
+    (fetchpatch {
+      name = "fno-common.patch";
+      url = "https://github.com/rixed/junkie/commit/52209c5b0c9a09981739ede9701cd73e82a88ea5.patch";
+      sha256 = "1qg01jinqn5wr2mz77rzaidnrli35di0k7lnx6kfm7dh7v8kxbrr";
+    })
+  ];
   buildInputs = [ libpcap guile openssl ];
   nativeBuildInputs = [ pkg-config ];
   configureFlags = [