diff options
| author | markuskowa <markus.kowalewski@gmail.com> | 2020-09-08 22:06:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-08 22:06:37 +0200 |
| commit | c26026f1adee0cbae9053fc5f09ae3dacf050fd7 (patch) | |
| tree | 2ed81752254227f66008590f2f5f1ea14d9cb2ab /pkgs/applications/video | |
| parent | 698e506cd62bc1f516c6773863a756277d0117e4 (diff) | |
| parent | 6378df317df37b000b0f651c3266b0620381f3eb (diff) | |
| download | nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar.gz nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar.bz2 nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar.lz nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar.xz nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.tar.zst nixpkgs-c26026f1adee0cbae9053fc5f09ae3dacf050fd7.zip | |
Merge pull request #97397 from ck3d/vdr-2.4.4
vdr: 2.4.1 -> 2.4.4
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vdr/default.nix | 18 | ||||
| -rw-r--r-- | pkgs/applications/video/vdr/glibc2.31-compat.patch | 15 |
2 files changed, 7 insertions, 26 deletions
diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 14ca503f2e9..bc3d54f3b5b 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -1,22 +1,18 @@ -{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig -, gettext, systemd, perl, lib, fetchpatch +{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig +, gettext, systemd, perl, lib , enableSystemd ? true , enableBidi ? true }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.4.1"; + version = "2.4.4"; - src = fetchurl { - url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2"; - sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5"; + src = fetchgit { + url = "git://git.tvdr.de/vdr.git"; + rev = "V20404"; + sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa"; }; - patches = [ - # Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6 - ./glibc2.31-compat.patch - ]; - enableParallelBuilding = true; postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd"; diff --git a/pkgs/applications/video/vdr/glibc2.31-compat.patch b/pkgs/applications/video/vdr/glibc2.31-compat.patch deleted file mode 100644 index 9a52d4b290b..00000000000 --- a/pkgs/applications/video/vdr/glibc2.31-compat.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/eit.c b/eit.c -index 50d8229..373dbca 100644 ---- a/eit.c -+++ b/eit.c -@@ -391,7 +391,9 @@ cTDT::cTDT(const u_char *Data) - if (abs(diff) > MAX_TIME_DIFF) { - mutex.Lock(); - if (abs(diff) > MAX_ADJ_DIFF) { -- if (stime(&dvbtim) == 0) -+ timespec ts = { 0 }; -+ ts.tv_sec = dvbtim; -+ if (clock_settime(CLOCK_REALTIME, &ts) == 0) - isyslog("system time changed from %s (%ld) to %s (%ld)", *TimeToString(loctim), loctim, *TimeToString(dvbtim), dvbtim); - else - esyslog("ERROR while setting system time: %m"); |