Author: urkud
Date: Fri Jan 27 17:55:41 2012
New Revision: 31889
URL: https://nixos.org/websvn/nix/?rev=31889&sc=1
Log:
More 'libpng = libpng12'
Modified:
nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
Modified: nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
17:49:20 2012 (r31888)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Fri Jan 27
17:55:41 2012 (r31889)
@@ -4423,6 +4423,7 @@
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 @@
};
qrdecode = builderDefsPackage (import ../tools/graphics/qrdecode) {
- inherit libpng;
+ libpng = libpng12;
opencv = opencv_2_1;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
