diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2022-05-07 12:10:19 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2022-05-07 18:32:19 +0100 |
| commit | 2f653769f8d759b9a2e64f0ff44913843dac867e (patch) | |
| tree | 2865799c5f08bdf8942d47580788eb24b9d42b68 /pkgs/applications/networking/instant-messengers/freetalk | |
| parent | 94c97dfa94876f455c3eacd48ae1a9d0b24d5daa (diff) | |
freetalk: pull pending fix for -fno-common toolchains
Without the change build on -fno-common toolchains like clamng-13 fails as:
$ nix build --impure --expr 'with import ./. {}; freetalk.override { stdenv = clang13Stdenv; }' -L
...
ld: more.o:src/./more.h:15: multiple definition of `cin'; primitives.o:src/./more.h:15: first defined here
ld: more.o:src/./more.h:14: multiple definition of `initial_settings'; primitives.o:src/./more.h:14: first defined here
Diffstat (limited to 'pkgs/applications/networking/instant-messengers/freetalk')
| -rw-r--r-- | pkgs/applications/networking/instant-messengers/freetalk/default.nix | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 4c28e346a124c..ffe82e6708aad 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; }; + patches = [ + # Pull pending patch for -fno-common tuulchain support: + # https://github.com/GNUFreetalk/freetalk/pull/39 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; + sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; + }) + ]; + preConfigure = '' ./autogen.sh ''; |