b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #177100 from trofi/fix-fno-common-for-tvheadend

Browse source 
tvheadend: pull upstream fix for -fno-common toolchains
This commit is contained in:
Sergei Trofimovich 2022-06-13 21:59:12 +00:00 committed by GitHub
parent 5179c4078b dfbb960094
commit 480fe8eece
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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