cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

vlc: 2.1.5 -> 2.2.0

Browse source
This commit is contained in:
Domen Kožar 2015-02-28 23:23:58 +01:00
parent 62080e3939
commit 362ba73ac6
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
pkgs/applications/video/vlc/default.nix
View file

@ -13,15 +13,16 @@
with stdenv.lib;
assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null);
assert (withQt5 -> qt5 != null);
assert (!withQt5 -> qt4 != null);
stdenv.mkDerivation rec {
name = "vlc-${version}";
version = "2.1.5";
version = "2.2.0";
src = fetchurl {
url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz";
sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg";
sha256 = "05smn9hqdp7iscc1dj4cxp1mrlad7b50lhlnlqisfzf493i2f2jy";
};
buildInputs =

2
pkgs/top-level/all-packages.nix
View file

@ -11784,7 +11784,7 @@ let
};
vlc = callPackage ../applications/video/vlc {
ffmpeg = ffmpeg_2_2;
ffmpeg = ffmpeg_2;
};
vlc_qt5 = vlc.override {