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

ffmpeg: order and cleanup versions

Browse Source
This commit is contained in:
Mathijs Kwik 2013-12-11 01:04:26 +01:00
parent e3acde0b44
commit d2ccef5140
2 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4126,14 +4126,6 @@ let
fcgi = callPackage ../development/libraries/fcgi { }; 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 { ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.nix {
vpxSupport = !stdenv.isMips; vpxSupport = !stdenv.isMips;
}; };
@ -4142,6 +4134,14 @@ let
vpxSupport = !stdenv.isMips; 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 { ffmpeg_1 = callPackage ../development/libraries/ffmpeg/1.x.nix {
vpxSupport = !stdenv.isMips; vpxSupport = !stdenv.isMips;
texinfo = texinfo5; texinfo = texinfo5;

1
pkgs/top-level/release-python.nix
View File

@ -334,7 +334,6 @@ let
ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; }; ffado = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
ffmpeg = { 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_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; }; fileschanged = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };
fio = { 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; }; firefox = { type = "job"; systems = ["x86_64-linux"]; schedulingPriority = 4; };