telegram-cli: pull patch pending upstream inclusion for -fno-common toolchain support
Without the change builds fails on upstream gcc-10 as: ld: objs/loop.o:/build/tg/loop.c:77: multiple definition of `verbosity'; objs/main.o:/build/tg/main.c:93: first defined here
This commit is contained in:
parent
8461d467d7
commit
5296a360c6
@ -1,4 +1,4 @@
|
|||||||
{ stdenv, fetchFromGitHub, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages
|
{ stdenv, fetchFromGitHub, fetchpatch, jansson, lib, libconfig, libevent, libgcrypt, lua, lua53Packages
|
||||||
, makeWrapper, openssl, pkg-config, python3, readline, zlib
|
, makeWrapper, openssl, pkg-config, python3, readline, zlib
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -14,6 +14,16 @@ stdenv.mkDerivation rec {
|
|||||||
fetchSubmodules = true;
|
fetchSubmodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
patches = [
|
||||||
|
# Pull patch pending upstream upstream inclusion for -fno-common toolchains:
|
||||||
|
# https://github.com/kenorb-contrib/tg/pull/61
|
||||||
|
(fetchpatch {
|
||||||
|
name = "fno-common.patch";
|
||||||
|
url = "https://github.com/kenorb-contrib/tg/commit/aad2e644fffa16066b227741d54de31bddb04ff8.patch";
|
||||||
|
sha256 = "sha256-LAa5J4BVj3QCiDSs+p2bynDroMSIqCeexQvrgaDl6OE=";
|
||||||
|
})
|
||||||
|
];
|
||||||
|
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
jansson
|
jansson
|
||||||
libconfig
|
libconfig
|
||||||
|
Loading…
Reference in New Issue
Block a user