cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

tvheadend: pull upstream fix for -fno-common toolchains

Browse source 
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
This commit is contained in:
Sergei Trofimovich 2022-06-09 23:06:06 +01:00
parent fdf46783c7
commit dfbb960094
1 changed files with 12 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
pkgs/servers/tvheadend/default.nix
View file

@ -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