pyrox.dev
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
+12
-1
pkgs/servers/tvheadend/default.nix
+12
-1
pkgs/servers/tvheadend/default.nix
···
1
-
{ lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config
2
, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2
3
, v4l-utils, which, zlib }:
4
···
27
rev = "v${version}";
28
sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m";
29
};
30
31
buildInputs = [
32
avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2
···
1
+
{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, makeWrapper, pkg-config
2
, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python2
3
, v4l-utils, which, zlib }:
4
···
27
rev = "v${version}";
28
sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m";
29
};
30
+
31
+
patches = [
32
+
# Pull upstream fix for -fno-common toolchain
33
+
# https://github.com/tvheadend/tvheadend/pull/1342
34
+
# TODO: can be removed with 4.3 release.
35
+
(fetchpatch {
36
+
name = "fno-common.patch";
37
+
url = "https://github.com/tvheadend/tvheadend/commit/bd92f1389f1aacdd08e913b0383a0ca9dc223153.patch";
38
+
sha256 = "17bsx6mnv4pjiayvx1d57dphva0kvlppvnmmaym06dh4524pnly1";
39
+
})
40
+
];
41
42
buildInputs = [
43
avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python2