diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:48:31 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-01-06 09:48:31 +0100 |
| commit | a4250d14784e318f44d084095f9a41aa4375105b (patch) | |
| tree | d324f345bee9408253768c7bfb5dc2db9f2831e0 /pkgs/applications/video | |
| parent | d47a99c450a95f2275b761d3e3b80b9764322abd (diff) | |
| parent | e5381cdeceeb150535998cee5518e6fa678e4dc0 (diff) | |
| download | nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar.gz nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar.bz2 nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar.lz nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar.xz nixlib-a4250d14784e318f44d084095f9a41aa4375105b.tar.zst nixlib-a4250d14784e318f44d084095f9a41aa4375105b.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/applications/video')
| -rw-r--r-- | pkgs/applications/video/obs-studio/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/applications/video/vlc/default.nix | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 9fc9c5871086..c98acda9eea0 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -91,6 +91,6 @@ in stdenv.mkDerivation rec { homepage = https://obsproject.com; maintainers = with maintainers; [ jb55 MP2E ]; license = licenses.gpl2; - platforms = with platforms; linux; + platforms = [ "x86_64-linux" "i686-linux" ]; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index cbf3c4917c35..8dee15206f49 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -21,11 +21,11 @@ assert (withQt5 -> qtbase != null && qtsvg != null && qtx11extras != null); stdenv.mkDerivation rec { name = "vlc-${version}"; - version = "3.0.4"; + version = "3.0.5"; src = fetchurl { url = "http://get.videolan.org/vlc/${version}/${name}.tar.xz"; - sha256 = "17jsq0zqpqyxw4ckvjba0hf6zk8ywc4wf8sy3z03hh3ij0vxpwq1"; + sha256 = "1nvj00khy08sing0mdnw6virmiq579mrk5rvpx9710nlxggqgh7m"; }; # VLC uses a *ton* of libraries for various pieces of functionality, many of |