Author: urkud
Date: Sun Jan 8 21:26:12 2012
New Revision: 31444
URL: https://nixos.org/websvn/nix/?rev=31444&sc=1
Log:
Pass libpng12 to qt-4.6
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 Sun Jan 8
20:58:04 2012 (r31443)
+++ nixpkgs/branches/libpng15/pkgs/top-level/all-packages.nix Sun Jan 8
21:26:12 2012 (r31444)
@@ -4448,6 +4448,7 @@
qt46 = callPackage ../development/libraries/qt-4.x/4.6 {
inherit (gnome) glib;
+ libpng = pkgs.libpng12;
};
qt47 = callPackage ../development/libraries/qt-4.x/4.7 {
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
