forked from mirrors/nixpkgs
ffmpeg: order and cleanup versions
This commit is contained in:
parent
e3acde0b44
commit
d2ccef5140
|
@ -4126,14 +4126,6 @@ let
|
|||
|
||||
fcgi = callPackage ../development/libraries/fcgi { };
|
||||
|
||||
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
|
||||
stdenv = if stdenv.isDarwin
|
||||
then overrideGCC stdenv gccApple
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
};
|
||||
|
@ -4142,6 +4134,14 @@ let
|
|||
vpxSupport = !stdenv.isMips;
|
||||
};
|
||||
|
||||
ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
|
||||
stdenv = if stdenv.isDarwin
|
||||
then overrideGCC stdenv gccApple
|
||||
else stdenv;
|
||||
};
|
||||
|
||||
ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
|
||||
vpxSupport = !stdenv.isMips;
|
||||
texinfo = texinfo5;
|
||||
|
|
|
@ -334,7 +334,6 @@ let
|
|||
ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg_0_6_90 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
ffmpeg_1_1 = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
fio = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
|
||||
|
|
Loading…
Reference in a new issue