Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tvheadend: 4.2.8 -> 4.3-unstable-2024-08-04 #332259

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 17 additions & 26 deletions pkgs/servers/tvheadend/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch

Check failure on line 4 in pkgs/servers/tvheadend/default.nix

View workflow job for this annotation

GitHub Actions / exp-nixf-tidy-check

sema-def-not-used

definition `fetchpatch` is not used

# buildtime
, makeWrapper
Expand All @@ -14,45 +14,39 @@
, bzip2
, dbus
, dtv-scan-tables
, ffmpeg_4
, ffmpeg_7
, gettext
, gnutar
, gzip
, libiconv
, openssl
, uriparser
, zlib
, libdvbcsa
, x264
, x265
, libvpx
, libopus
}:

let
version = "4.2.8";
version = "4.3-unstable-2024-08-04";
in stdenv.mkDerivation {
pname = "tvheadend";
inherit version;

src = fetchFromGitHub {
owner = "tvheadend";
repo = "tvheadend";
rev = "v${version}";
sha256 = "1xq059r2bplaa0nd0wkhw80jfwd962x0h5hgd7fz2yp6largw34m";
rev = "078a822cf548b37bc474475fa57e48e9604090ee";
hash = "sha256-3uCFPGBe5xCxsX7LU9HAwAtB51V2Iet1Uxin7cYhwoI=";
};

outputs = [
"out"
"man"
];

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";
})
];

nativeBuildInputs = [
makeWrapper
pkg-config
Expand All @@ -64,25 +58,22 @@
avahi
bzip2
dbus
ffmpeg_4 # depends on libav
ffmpeg_7
gettext
gzip
libiconv
openssl
uriparser
zlib
libdvbcsa
x264
x265
libvpx
libopus
];

enableParallelBuilding = true;

env.NIX_CFLAGS_COMPILE = toString ([
"-Wno-error=format-truncation"
"-Wno-error=stringop-truncation"
] ++ lib.optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "12") [
# Needed with GCC 12 but unrecognized with GCC 9
"-Wno-error=use-after-free"
]);

configureFlags = [
# disable dvbscan, as having it enabled causes a network download which
# cannot happen during build. We now include the dtv-scan-tables ourselves
Expand All @@ -103,10 +94,10 @@

preConfigure = ''
substituteInPlace src/config.c \
--replace /usr/bin/tar ${gnutar}/bin/tar
--replace-fail /usr/bin/tar ${gnutar}/bin/tar

substituteInPlace src/input/mpegts/scanfile.c \
--replace /usr/share/dvb ${dtv-scan-tables}/share/dvbv5
--replace-fail /usr/share/dvb ${dtv-scan-tables}/share/dvbv5

# the version detection script `support/version` reads this file if it
# exists, so let's just use that
Expand Down
Loading