diff options
author | markuskowa <markus.kowalewski@gmail.com> | 2024-01-01 16:58:11 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-01 16:58:11 +0100 |
commit | 009b625a548005812afaf66b0aabba003d3a4df4 (patch) | |
tree | bb920e90e83118f51c3ad1447a4047382085afa6 | |
parent | 4342fd9ee723d5caf59ae7b021fd3acb3ac0f2e3 (diff) | |
parent | 37fef59ab4d7a9b0c6d1d03c3502d1ee5c594c01 (diff) | |
download | nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar.gz nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar.bz2 nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar.lz nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar.xz nixlib-009b625a548005812afaf66b0aabba003d3a4df4.tar.zst nixlib-009b625a548005812afaf66b0aabba003d3a4df4.zip |
Merge pull request #277792 from ck3d/vdr-updates-2023-12
vdr: updates 2023/12
-rw-r--r-- | nixos/modules/services/hardware/vdr.nix | 1 | ||||
-rw-r--r-- | pkgs/applications/video/vdr/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/vdr/markad/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/video/vdr/softhddevice/default.nix | 8 |
4 files changed, 11 insertions, 6 deletions
diff --git a/nixos/modules/services/hardware/vdr.nix b/nixos/modules/services/hardware/vdr.nix index afa64fa16c4a..5feb379b50d1 100644 --- a/nixos/modules/services/hardware/vdr.nix +++ b/nixos/modules/services/hardware/vdr.nix @@ -45,6 +45,7 @@ in { systemd.services.vdr = { description = "VDR"; wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; serviceConfig = { ExecStart = '' ${cfg.package}/bin/vdr \ diff --git a/pkgs/applications/video/vdr/default.nix b/pkgs/applications/video/vdr/default.nix index 08d6c004de10..2df646d7578a 100644 --- a/pkgs/applications/video/vdr/default.nix +++ b/pkgs/applications/video/vdr/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { pname = "vdr"; - version = "2.6.4"; + version = "2.6.5"; src = fetchgit { url = "git://git.tvdr.de/vdr.git"; rev = version; - sha256 = "sha256-QCq+IxulrxDX+fzI+IHywboemJQnUfZrHRzP6B9qfvk="; + hash = "sha256-CKgo1Saj6EkSRNoIh16wzGHmToIMADZtjd8VQ+c1nus="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/video/vdr/markad/default.nix b/pkgs/applications/video/vdr/markad/default.nix index 808552d4f935..335767204c43 100644 --- a/pkgs/applications/video/vdr/markad/default.nix +++ b/pkgs/applications/video/vdr/markad/default.nix @@ -19,12 +19,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-markad"; - version = "3.3.6"; + version = "3.4.2"; src = fetchFromGitHub { repo = "vdr-plugin-markad"; owner = "kfb77"; - sha256 = "sha256-aHhQljWE1om/mILM+TXB9uPTrUwNNc4Loiejbakj9NU="; + sha256 = "sha256-C7s/92xmG6bffRqr3ndecmi/RbVlboRsYZLLThLYEzQ="; rev = "V${version}"; }; diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index 437c8d16cfd8..1f0cee44df32 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -9,15 +9,17 @@ , libva , libvdpau , xorg +, libGL +, libGLU }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.0.6"; + version = "2.0.7"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-eE2cxqV/XpGyxneVzpP7f215IReH1nwGEkfCHbxUgVs="; + sha256 = "sha256-AzWYgR0IdB4922HxH7K83heRIEi31fz20Z2W7E9ljXw="; rev = "v${version}"; }; @@ -30,6 +32,8 @@ stdenv.mkDerivation rec { libvdpau xorg.libxcb xorg.libX11 + libGL + libGLU ]; makeFlags = [ "DESTDIR=$(out)" ]; |