about summary refs log tree commit diff
path: root/pkgs/applications/video/vlc
diff options
context:
space:
mode:
authorAnderson Torres <torres.anderson.85@protonmail.com>2022-01-26 08:07:24 -0300
committerGitHub <noreply@github.com>2022-01-26 08:07:24 -0300
commit3a12b3a64a371589c1e1e41649e92fc8cb2fa649 (patch)
tree9ce966a8c20e759deab8bd35d62d91ef4e191aaf /pkgs/applications/video/vlc
parent93aa8b3207dbfca61932557527fd39ace117d263 (diff)
parentca07883f10fc464d5dd877defb72b9dd436af3ca (diff)
Merge pull request #155725 from FliegendeWurst/live555-2022
live555: 2019.11.22 -> 2022.01.21
Diffstat (limited to 'pkgs/applications/video/vlc')
-rw-r--r--pkgs/applications/video/vlc/default.nix10
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 1efebb6fdf559..df7f2fff5ea46 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -192,6 +192,16 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4250fe8f28c220d883db454cec2b2c76a07473eb/trunk/vlc-3.0.11.1-srt_1.4.2.patch";
       sha256 = "53poWjZfwq/6l316sqiCp0AtcGweyXBntcLDFPSokHQ=";
     })
+    # patches to build with recent live555
+    # upstream issue: https://code.videolan.org/videolan/vlc/-/issues/25473
+    (fetchpatch {
+      url = "https://code.videolan.org/videolan/vlc/uploads/3c84ea58d7b94d7a8d354eaffe4b7d55/0001-Get-addr-by-ref.-from-getConnectionEndpointAddress.patch";
+      sha256 = "171d3qjl9a4dm13sqig3ra8s2zcr76wfnqz4ba4asg139cyc1axd";
+    })
+    (fetchpatch {
+      url = "https://code.videolan.org/videolan/vlc/uploads/eb1c313d2d499b8a777314f789794f9d/0001-Add-lssl-and-lcrypto-to-liblive555_plugin_la_LIBADD.patch";
+      sha256 = "0kyi8q2zn2ww148ngbia9c7qjgdrijf4jlvxyxgrj29cb5iy1kda";
+    })
   ];
 
   postPatch = ''