ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-30 15:23:26 +03:00
Code Issues Projects Releases Wiki Activity

opencv: use default/latest ffmpeg

Browse Source
This commit is contained in:
Mathijs Kwik 2013-12-23 10:50:07 +01:00
parent 3a1d772861
commit 4fdeca4c57
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5401,12 +5401,9 @@ let
openct = callPackage ../development/libraries/openct { }; openct = callPackage ../development/libraries/openct { };
opencv = callPackage ../development/libraries/opencv { opencv = callPackage ../development/libraries/opencv { };
ffmpeg = ffmpeg_0_6_90;
};
opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix { opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
ffmpeg = ffmpeg_0_6_90;
libpng = libpng12; libpng = libpng12;
}; };