mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-24 06:08:16 +03:00
vdr: 2.4.1 -> 2.4.4
This commit is contained in:
parent
61525137fd
commit
6378df317d
@ -1,22 +1,18 @@
|
|||||||
{ stdenv, fetchurl, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
|
{ stdenv, fetchgit, fontconfig, libjpeg, libcap, freetype, fribidi, pkgconfig
|
||||||
, gettext, systemd, perl, lib, fetchpatch
|
, gettext, systemd, perl, lib
|
||||||
, enableSystemd ? true
|
, enableSystemd ? true
|
||||||
, enableBidi ? true
|
, enableBidi ? true
|
||||||
}: stdenv.mkDerivation rec {
|
}: stdenv.mkDerivation rec {
|
||||||
|
|
||||||
pname = "vdr";
|
pname = "vdr";
|
||||||
version = "2.4.1";
|
version = "2.4.4";
|
||||||
|
|
||||||
src = fetchurl {
|
src = fetchgit {
|
||||||
url = "ftp://ftp.tvdr.de/vdr/${pname}-${version}.tar.bz2";
|
url = "git://git.tvdr.de/vdr.git";
|
||||||
sha256 = "1p51b14aqzncx3xpfg0rjplc48pg7520035i5p6r5zzkqhszihr5";
|
rev = "V20404";
|
||||||
|
sha256 = "1fzghnp5mpcwn3a3fyk3w8h15z4f2cnc75247kvxj1c9069mgnwa";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
|
||||||
# Derived from http://git.tvdr.de/?p=vdr.git;a=commit;h=930c2cd2eb8947413e88404fa94c66e4e1db5ad6
|
|
||||||
./glibc2.31-compat.patch
|
|
||||||
];
|
|
||||||
|
|
||||||
enableParallelBuilding = true;
|
enableParallelBuilding = true;
|
||||||
|
|
||||||
postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
|
postPatch = "substituteInPlace Makefile --replace libsystemd-daemon libsystemd";
|
||||||
|
@ -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");
|
|
Loading…
Reference in New Issue
Block a user