summary refs log tree commit diff
path: root/pkgs/applications/video
diff options
context:
space:
mode:
authorCorey O'Connor <coreyoconnor@gmail.com>2018-09-26 14:22:40 -0700
committerxeji <36407913+xeji@users.noreply.github.com>2018-09-26 23:22:40 +0200
commit26ce2652584b46adac8704d67e04984069fdc799 (patch)
treec8b0af56f96ec9680bdcffbe51c36d2952f69437 /pkgs/applications/video
parent23900febe79a3a6aaab1276cde8689e0fa3f3d5c (diff)
downloadnixlib-26ce2652584b46adac8704d67e04984069fdc799.tar
nixlib-26ce2652584b46adac8704d67e04984069fdc799.tar.gz
nixlib-26ce2652584b46adac8704d67e04984069fdc799.tar.bz2
nixlib-26ce2652584b46adac8704d67e04984069fdc799.tar.lz
nixlib-26ce2652584b46adac8704d67e04984069fdc799.tar.xz
nixlib-26ce2652584b46adac8704d67e04984069fdc799.tar.zst
nixlib-26ce2652584b46adac8704d67e04984069fdc799.zip
vlc: 3.0.3 -> 3.0.4 (#47406)
Diffstat (limited to 'pkgs/applications/video')
-rw-r--r--pkgs/applications/video/vlc/default.nix16
1 files changed, 2 insertions, 14 deletions
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index 6fedc227e447..b08ff812ace4 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -20,11 +20,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null);
 
 stdenv.mkDerivation rec {
   name = "vlc-${version}";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchurl {
     url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz";
-    sha256 = "0lavzly8l0ll1d9iris9cnirgcs77g48lxj14058dxqkvd5v1a4v";
+    sha256 = "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1";
   };
 
   # VLC uses a *ton* of libraries for various pieces of functionality, many of
@@ -52,18 +52,6 @@ stdenv.mkDerivation rec {
   # set the path to the compiler
   BUILDCC = "${stdenv.cc}/bin/gcc";
 
-  patches = [
-    (fetchpatch {
-      name = "vlc-qt5.11.patch";
-      url = "https://git.archlinux.org/svntogit/packages.git/plain/trunk/vlc-qt5.11.patch?h=packages/vlc";
-      sha256 = "0yh65bhhaz876cazhagnafs1dr61184lpj3y0m3y7k37bswykj8p";
-    })
-    (fetchpatch {
-      url = "https://github.com/videolan/vlc/commit/26e2d3906658c30f2f88f4b1bc9630ec43bf5525.patch";
-      sha256 = "0sm73cbzxva8sww526bh5yin1k2pdkvj826wdlmqnj7xf0f3mki4";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace configure \
       --replace /bin/echo echo