colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sniproxy: pull upstream fix for -fno-common toolchain support

Browse Source 
Without the change build fails against upstream gcc-10 as:

   ld: tls.o:/build/source/src/tls.h:31: multiple definition of
     `tls_protocol'; listener.o:/build/source/src/tls.h:31: first defined here
This commit is contained in:
Sergei Trofimovich 2022-05-29 07:52:16 +01:00
parent 0831857a14
commit ae7e4c0ef5
1 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/applications/networking/sniproxy/default.nix
View File

@ -1,4 +1,4 @@
{ lib, stdenv, fetchFromGitHub, autoreconfHook, gettext, libev, pcre, pkg-config, udns }:
{ lib, stdenv, fetchFromGitHub, fetchpatch, autoreconfHook, gettext, libev, pcre, pkg-config, udns }:
stdenv.mkDerivation rec {
pname = "sniproxy";
@ -11,6 +11,16 @@ stdenv.mkDerivation rec {
sha256 = "0isgl2lyq8vz5kkxpgyh1sgjlb6sqqybakr64w2mfh29k5ls8xzm";
};
patches = [
# Pull upstream fix for -fno-common toolchain support:
# https://github.com/dlundquist/sniproxy/pull/349
(fetchpatch {
name = "fno-common.patch";
url = "https://github.com/dlundquist/sniproxy/commit/711dd14affd5d0d918cd5fd245328450e60c7111.patch";
sha256 = "1vlszib2gzxnkl9zbbrf2jz632j1nhs4aanpw7qqnx826zmli0a6";
})
];
nativeBuildInputs = [ autoreconfHook pkg-config ];
buildInputs = [ gettext libev pcre udns ];