diff options
| author | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
|---|---|---|
| committer | Jonathan Ringer <jonringer117@gmail.com> | 2021-11-21 14:40:40 -0800 |
| commit | 09e494f4c296b29755fb8639e3f751f6aa706a45 (patch) | |
| tree | 1f1ff77e46b78c8d91808fef8405361366867dd4 /pkgs/applications/video | |
| parent | 6b8044795e4b7ff99b96259a4a6b09eb9380703d (diff) | |
| parent | b2181bc967053310657128d687e44ec683e7604b (diff) | |
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts: pkgs/applications/window-managers/sway/default.nix
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/vdr/plugins.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/applications/video/vdr/plugins.nix b/pkgs/applications/video/vdr/plugins.nix index 96b3733b02d6a..f7eb5f201e851 100644 --- a/pkgs/applications/video/vdr/plugins.nix +++ b/pkgs/applications/video/vdr/plugins.nix @@ -62,6 +62,8 @@ in { postPatch = '' substituteInPlace vaapidev.c --replace /usr/bin/X ${xorgserver}/bin/X + # https://github.com/rofafor/vdr-plugin-vaapidevice/issues/5 + substituteInPlace Makefile --replace libva libva-x11 ''; src = fetchFromGitHub { |