mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-20 12:29:02 +02:00
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
This commit is contained in:
parent
99b94f9522
commit
693bb5c17d
|
@ -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 = [
|
||||
|
|
Loading…
Reference in a new issue