Merge pull request #19683 from grahamc/ffmpeg

ffmpeg: 3.1.3 -> 3.1.4
This commit is contained in:
Graham Christensen 2016-10-19 20:59:52 -04:00 committed by GitHub
commit 1cbdc98f44

View File

@ -5,9 +5,9 @@
}@args: }@args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}.3"; version = "${branch}.4";
branch = "3.1"; branch = "3.1";
sha256 = "0f4ajs0c4088nkal4gqagx05wfyhd1izfxmzxxsdh56ibp38kg2q"; sha256 = "1ynb1f0py5jb6hs78ypynpwc3jlqrw51vl8y1wnd44nwlisxz6bw";
darwinFrameworks = [ Cocoa CoreMedia ]; darwinFrameworks = [ Cocoa CoreMedia ];
patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch; patches = stdenv.lib.optional stdenv.isDarwin ./sdk_detection.patch;
}) })