diff options
| author | Michael Weiss <dev.primeos@gmail.com> | 2019-08-10 14:04:40 +0200 |
|---|---|---|
| committer | Michael Weiss <dev.primeos@gmail.com> | 2019-08-10 14:09:22 +0200 |
| commit | 28d637d345dd1e0344d9dd6de7e43e2e24fbf412 (patch) | |
| tree | d7d4f1a1547ba5b390f12986a422c649d2015873 /pkgs/development/libraries/ffmpeg | |
| parent | 7680b512cb8a9e0cac6c54b2096f1b5c4eb9e34c (diff) | |
| download | nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar.gz nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar.bz2 nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar.lz nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar.xz nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.tar.zst nixpkgs-28d637d345dd1e0344d9dd6de7e43e2e24fbf412.zip | |
ffmpeg_4: 4.1.4 -> 4.2
Changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/blob/refs/heads/release/4.2:/Changelog
Diffstat (limited to 'pkgs/development/libraries/ffmpeg')
| -rw-r--r-- | pkgs/development/libraries/ffmpeg/4.nix | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/pkgs/development/libraries/ffmpeg/4.nix b/pkgs/development/libraries/ffmpeg/4.nix index 3431943155e..8fd2ce70498 100644 --- a/pkgs/development/libraries/ffmpeg/4.nix +++ b/pkgs/development/libraries/ffmpeg/4.nix @@ -6,12 +6,7 @@ callPackage ./generic.nix (args // rec { version = "${branch}"; - branch = "4.1.4"; - sha256 = "01w44ygm5bvc243hlhfnvb2lxfb0blz2cxnphxqgw30vj3c1prx7"; - patches = [(fetchpatch { # remove on update - name = "fix-hardcoded-tables.diff"; - url = "http://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/c8232e50074f"; - sha256 = "0jlksks4fjajby8fjk7rfp414gxfdgd6q9khq26i52xvf4kg2dw6"; - })]; + branch = "4.2"; + sha256 = "1f3glany3p2j832a9wia5vj8ds9xpm0xxlyia91y17hy85gxwsrh"; darwinFrameworks = [ Cocoa CoreMedia VideoToolbox ]; }) |