From dfbb960094c6136dd7fe2829427bd5af6d97f7ce Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 9 Jun 2022 23:06:06 +0100 Subject: [PATCH] tvheadend: pull upstream fix for -fno-common toolchains Without the change build fails on upstream gcc-10 as: ld: src/descrambler/constcw.o:src/input.h:131: multiple definition of `tvh_inputs'; src/main.o:src/input.h:131: first defined here --- pkgs/servers/tvheadend/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/tvheadend/default.nix b/pkgs/servers/tvheadend/default.nix index 64e8d423d91b..98069c802385 100644 --- a/pkgs/servers/tvheadend/default.nix +++ b/pkgs/servers/tvheadend/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, pkg-config , avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2 , v4l-utils, which, zlib }: @@ -28,6 +28,17 @@ in stdenv.mkDerivation { sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m"; }; + patches = [ + # Pull upstream fix for -fno-common toolchain + # https://github.com/tvheadend/tvheadend/pull/1342 + # TODO: can be removed with 4.3 release. + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/tvheadend/tvheadend/commit/bd92f1389f1aacdd08e913b0383a0ca9dc223153.patch"; + sha256 = "17bsx6mnv4pjiayvx1d57dphva0kvlppvnmmaym06dh4524pnly1"; + }) + ]; + buildInputs = [ avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2 which zlib