diff options
author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-29 07:52:16 +0100 |
---|---|---|
committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-29 07:52:16 +0100 |
commit | ae7e4c0ef54b63a76bda4dbfefd15127674170fc (patch) | |
tree | 72d37fb4e6ae6b373982eba4e290cded48b07d87 /pkgs/applications/networking/sniproxy/default.nix | |
parent | 0831857a140328c5c40be233eaa73130620a44b2 (diff) |
sniproxy: pull upstream fix for -fno-common toolchain support
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
Diffstat (limited to 'pkgs/applications/networking/sniproxy/default.nix')
-rw-r--r-- | pkgs/applications/networking/sniproxy/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/networking/sniproxy/default.nix b/pkgs/applications/networking/sniproxy/default.nix index 6652e7c986c38..7c8e3dfd93dc4 100644 --- a/pkgs/applications/networking/sniproxy/default.nix +++ b/pkgs/applications/networking/sniproxy/default.nix @@ -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 ]; |