mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-25 08:23:09 +00:00
ffmpeg: switch to default versioning-scheme
This commit is contained in:
parent
cf9cc60a8d
commit
e3acde0b44
@ -4126,7 +4126,7 @@ let
|
||||
|
||||
fcgi = callPackage ../development/libraries/fcgi { };
|
||||
|
||||
ffmpeg = callPackage ../development/libraries/ffmpeg {
|
||||
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
|
||||
stdenv = if stdenv.isDarwin
|
||||
@ -4152,6 +4152,8 @@ let
|
||||
texinfo = texinfo5;
|
||||
};
|
||||
|
||||
ffmpeg = ffmpeg_0_10;
|
||||
|
||||
ffms = callPackage ../development/libraries/ffms { };
|
||||
|
||||
fftw = callPackage ../development/libraries/fftw {
|
||||
|
Loading…
Reference in New Issue
Block a user