diff options
| author | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-11 01:04:26 +0100 |
|---|---|---|
| committer | Mathijs Kwik <mathijs@bluescreen303.nl> | 2013-12-23 11:03:09 +0100 |
| commit | d2ccef5140daa898b13ebe21c39fde612c7fe22f (patch) | |
| tree | 6389ae6bc70d8c2016979efd059d527c4eb6d114 /pkgs | |
| parent | e3acde0b4471d1594c9175a4ed76a8796382913c (diff) | |
ffmpeg: order and cleanup versions
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 14 | ||||
| -rw-r--r-- | pkgs/top-level/release-python.nix | 1 |
2 files changed, 7 insertions, 8 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d5f25fa1ae2..24055cf747f5f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4126,20 +4126,20 @@ let fcgi = callPackage ../development/libraries/fcgi { }; - ffmpeg_0_10 = callPackage ../development/libraries/ffmpeg/0.10.nix { + ffmpeg_0_6 = callPackage ../development/libraries/ffmpeg/0.6.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_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { vpxSupport = !stdenv.isMips; }; - ffmpeg_0_6_90 = callPackage ../development/libraries/ffmpeg/0.6.90.nix { + 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 { diff --git a/pkgs/top-level/release-python.nix b/pkgs/top-level/release-python.nix index 5aafba980b908..ef7b1da92ab60 100644 --- a/pkgs/top-level/release-python.nix +++ b/pkgs/top-level/release-python.nix @@ -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; }; |