summary refs log tree commit diff
path: root/pkgs/top-level
diff options
context:
space:
mode:
authorxeji <36407913+xeji@users.noreply.github.com>2018-05-10 18:21:38 +0200
committerGitHub <noreply@github.com>2018-05-10 18:21:38 +0200
commit1463480edbf6757140b3764dcec2fa720978add6 (patch)
treee92eb103ed0722726c6386628fa2d64f4e60743c /pkgs/top-level
parent1d682d5314e7999a2a347fe66af5dca39166551c (diff)
parentd691c8170ae2a8ef73c40f6187e7181015f8cdca (diff)
downloadnixlib-1463480edbf6757140b3764dcec2fa720978add6.tar
nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.gz
nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.bz2
nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.lz
nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.xz
nixlib-1463480edbf6757140b3764dcec2fa720978add6.tar.zst
nixlib-1463480edbf6757140b3764dcec2fa720978add6.zip
Merge pull request #40289 from yegortimoshenko/mpv-bump
 mpv: 0.27.2 -> 0.28.2
Diffstat (limited to 'pkgs/top-level')
-rw-r--r--pkgs/top-level/all-packages.nix4
1 files changed, 4 insertions, 0 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c4421b997e43..eb37b8a1744f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8870,6 +8870,10 @@ with pkgs;
   ffmpeg_3_4 = callPackage ../development/libraries/ffmpeg/3.4.nix {
     inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
   };
+  ffmpeg_4 = callPackage ../development/libraries/ffmpeg/4.nix {
+    inherit (darwin.apple_sdk.frameworks) Cocoa CoreMedia;
+  };
+
   # Aliases
   ffmpeg_0 = ffmpeg_0_10;
   ffmpeg_1 = ffmpeg_1_2;