diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-21 09:47:17 +0100 |
|---|---|---|
| committer | Matthieu Coudron <teto@users.noreply.github.com> | 2022-05-21 15:11:52 +0200 |
| commit | 705f5cf21e727052455bc2eee831e718404059a9 (patch) | |
| tree | 3ea23efda8f09a25280ebfda901d0291d367ead2 /pkgs/tools/networking/email | |
| parent | b87b69fae93ec650af830042c879453aa46135a1 (diff) | |
email: pull patch pending upstream inclusion for -fno-common toolchain supprot
Without the change build fails on upstream gcc-10 as:
ld: utils.o:include/email.h:81: multiple definition of `Mopts'; email.o:include/email.h:81: first defined here
ld: utils.o:include/email.h:64: multiple definition of `table'; email.o:include/email.h:64: first defined here
ld: utils.o:include/email.h:65: multiple definition of `conf_file'; email.o:include/email.h:65: first defined here
Diffstat (limited to 'pkgs/tools/networking/email')
| -rw-r--r-- | pkgs/tools/networking/email/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/tools/networking/email/default.nix b/pkgs/tools/networking/email/default.nix index 2a6faa9c17316..8848068d0dea1 100644 --- a/pkgs/tools/networking/email/default.nix +++ b/pkgs/tools/networking/email/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, openssl }: +{ stdenv, lib, fetchFromGitHub, fetchpatch, openssl }: let eMailSrc = fetchFromGitHub { @@ -24,6 +24,16 @@ stdenv.mkDerivation { version = "unstable-2016-01-31"; src = eMailSrc; + patches = [ + # Pul patch pending upstream inclusion for -fno-common toolchain support: + # https://github.com/deanproxy/eMail/pull/61 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/deanproxy/eMail/commit/c3c1e52132832be0e51daa6e0037d5bb79a17751.patch"; + sha256 = "17ndrb65g0v4y521333h4244419s8nncm0yx2jwv12sf0dl6gy8i"; + }) + ]; + buildInputs = [ openssl ]; unpackPhase = '' |