alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #7918 from codyopel/ffmpeg

Browse source 
ffmpeg(-full): 2.6.2 -> 2.6.3
This commit is contained in:
Arseniy Seroka 2015-05-21 15:48:23 +03:00
parent 5277bf945d 61fa78293d
commit 8d10975e4d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/ffmpeg-full/default.nix
View file

@ -231,11 +231,11 @@ assert x11grabExtlib -> libX11 != null && libXv != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "ffmpeg-${version}"; name = "ffmpeg-${version}";
version = "2.6.2"; version = "2.6.3";
src = fetchurl { src = fetchurl {
url = "https://www.ffmpeg.org/releases/${name}.tar.bz2"; url = "https://www.ffmpeg.org/releases/${name}.tar.bz2";
sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
}; };
patchPhase = ''patchShebangs .''; patchPhase = ''patchShebangs .'';

4
pkgs/development/libraries/ffmpeg/2.6.nix
View file

@ -1,7 +1,7 @@
{ callPackage, ... } @ args: { callPackage, ... } @ args:
callPackage ./generic.nix (args // rec { callPackage ./generic.nix (args // rec {
version = "${branch}.2"; version = "${branch}.3";
branch = "2.6"; branch = "2.6";
sha256 = "1fi93zy98wmls7x3jpr2yvckk2ia6a1yyygwrfaxq95pd6h3m7l8"; sha256 = "1yqc3vm1xrwf866q262qd4nr9d6ifp4gg183pjdc4sl9np0rissr";
}) })