From 83d4b462fe1063d109c64defcf4fdc77259a3100 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 27 Jan 2012 17:55:41 +0000
Subject: [PATCH] More 'libpng = libpng12'

svn path=/nixpkgs/branches/libpng15/; revision=31889
---
 pkgs/top-level/all-packages.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index da97106a9918..9b35f0e74a16 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4423,6 +4423,7 @@ let
 
   opencv_2_1 = callPackage ../development/libraries/opencv/2.1.nix {
     ffmpeg = ffmpeg_0_6_90;
+    libpng = libpng12;
     inherit (gst_all) gstreamer;
   };
 
@@ -6968,7 +6969,7 @@ let
   };
 
   qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
-    inherit libpng;
+    libpng = libpng12;
     opencv = opencv_2_1;
   };