public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ffmpeg: switch to default versioning-scheme

This commit is contained in:
Mathijs Kwik 2013-12-11 00:58:53 +01:00
parent cf9cc60a8d
commit e3acde0b44
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/libraries/ffmpeg/default.nix → pkgs/development/libraries/ffmpeg/0.10.nix
View File

4
pkgs/top-level/all-packages.nix
View File

@ -4126,7 +4126,7 @@ let
fcgi = callPackage ../development/libraries/fcgi { }; fcgi = callPackage ../development/libraries/fcgi { };
ffmpeg = callPackage ../development/libraries/ffmpeg { ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
vpxSupport = !stdenv.isMips; vpxSupport = !stdenv.isMips;
stdenv = if stdenv.isDarwin stdenv = if stdenv.isDarwin
@ -4152,6 +4152,8 @@ let
texinfo = texinfo5; texinfo = texinfo5;
}; };
ffmpeg = ffmpeg_0_10;
ffms = callPackage ../development/libraries/ffms { }; ffms = callPackage ../development/libraries/ffms { };
fftw = callPackage ../development/libraries/fftw { fftw = callPackage ../development/libraries/fftw {