More 'libpng = libpng12'

svn path=/nixpkgs/branches/libpng15/; revision=31889
This commit is contained in:
Yury G. Kudryashov 2012-01-27 17:55:41 +00:00
parent e155073b2c
commit 83d4b462fe

View File

@ -4423,6 +4423,7 @@ let
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; ffmpeg = ffmpeg_0_6_90;
libpng = libpng12;
inherit (gst_all) gstreamer; inherit (gst_all) gstreamer;
}; };
@ -6968,7 +6969,7 @@ let
}; };
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) { qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
inherit libpng; libpng = libpng12;
opencv = opencv_2_1; opencv = opencv_2_1;
}; };