Merge pull request #175255 from trofi/fix-fno-common-for-sniproxy
sniproxy: pull upstream fix for -fno-common toolchain support
This commit is contained in:
commit
8bf6c20b2f
|
@ -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 ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue