mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-27 13:57:10 +03:00
Merge pull request #58219 from dtzWill/update/ffmpeg-4.1.2
ffmpeg{_4,-full}: 4.1.1 -> 4.1.2
This commit is contained in:
commit
1e94f5ec6d
@ -231,11 +231,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-full-${version}";
|
||||
version = "4.1.1";
|
||||
version = "4.1.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
|
||||
sha256 = "11id9pm4azfrhpa4vr2yaw31dzgd55kl1zsxwn24sczx9n14jdrp";
|
||||
sha256 = "0yrl6nij4b1pk1c4nbi80857dsd760gziiss2ls19awq8zj0lpxr";
|
||||
};
|
||||
|
||||
prePatch = ''
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}";
|
||||
branch = "4.1.1";
|
||||
sha256 = "0n5hz98gcyznj8lnqma6c9004vhcdzv67a4angnd1k6ai8xhxd0c";
|
||||
branch = "4.1.2";
|
||||
sha256 = "00yzwc2g97h8ws0haz1p0ahaavhgrbha6xjdc53a5vyfy3zyy3i0";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user