diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-08-01 12:03:16 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-08-01 12:03:16 +0000 |
| commit | 06a0d9d95c4f46979ccd9b32312a4025876083ec (patch) | |
| tree | 1f58a4d7a747d950e61f7660ac7be5d371b6f111 /pkgs | |
| parent | 444263db251404835db0996eae207f30b802b0d1 (diff) | |
* More packages that require the old ffmpeg. BTW, maybe this should be the old-ABI ffmpeg (0.7.2).
svn path=/nixpkgs/branches/kde-4.7/; revision=28110
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e9e4d379b8cf0..f63ff50aa7ee2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4070,7 +4070,8 @@ let openct = callPackage ../development/libraries/openct { }; opencv = callPackage ../development/libraries/opencv { - inherit (gst_all) gstreamer; + ffmpeg = ffmpeg_0_6_90; + inherit (gst_all) gstreamer; }; # this ctl version is needed by openexr_viewers @@ -4705,7 +4706,9 @@ let lighttpd = callPackage ../servers/http/lighttpd { }; - mediatomb = callPackage ../servers/mediatomb { }; + mediatomb = callPackage ../servers/mediatomb { + ffmpeg = ffmpeg_0_6_90; + }; mod_python = callPackage ../servers/http/apache-modules/mod_python { }; |