mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-12-26 21:21:57 +03:00
Merge pull request #26504 from gentoofreak/ffmpeg-3.3.2
ffmpeg{,-full}: 3.3.1 -> 3.3.2
This commit is contained in:
commit
08ec54a86d
@ -230,11 +230,11 @@ assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing;
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "ffmpeg-full-${version}";
|
||||
version = "3.3.1";
|
||||
version = "3.3.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.ffmpeg.org/releases/ffmpeg-${version}.tar.xz";
|
||||
sha256 = "0bwgm6z6k3khb91qh9xv15inykkfchpkm0lcdckkxhkacpyaf0mp";
|
||||
sha256 = "11974vcfsy8w0i6f4lfwqmg80xkfybqw7vw6zzrcn5i6ncddx60r";
|
||||
};
|
||||
|
||||
patchPhase = ''patchShebangs .
|
||||
|
@ -6,7 +6,7 @@
|
||||
|
||||
callPackage ./generic.nix (args // rec {
|
||||
version = "${branch}";
|
||||
branch = "3.3.1";
|
||||
sha256 = "0c37bdqwmaziikr2d5pqp7504ail6i7a1mfcmc06mdpwfxxwvcpw";
|
||||
branch = "3.3.2";
|
||||
sha256 = "0slf12dxk6wq1ns09kqqqrzwylxcy0isvc3niyxig45gq3ah0s91";
|
||||
darwinFrameworks = [ Cocoa CoreMedia ];
|
||||
})
|
||||
|
Loading…
Reference in New Issue
Block a user