Fixing the vxl build.

svn path=/nixpkgs/trunk/; revision=32848

pkgs/development/libraries/vxl/default.nix

@@ -9,11 +9,12 @@ stdenv.mkDerivation {
 
   buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ];
 
-  cmakeFlags = if (stdenv.system == "x86_64-linux") then
+  cmakeFlags = "-DBUILD_TESTING=OFF " + (if (stdenv.system == "x86_64-linux") then
       "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
     else
-      "";
-    
+      "");
+
+  enableParallelBuilding = true;
 
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";

pkgs/top-level/all-packages.nix

@@ -4728,7 +4728,9 @@ let
 
   vtk = callPackage ../development/libraries/vtk { };
 
-  vxl = callPackage ../development/libraries/vxl { };
+  vxl = callPackage ../development/libraries/vxl {
+    libpng = libpng12;
+  };
 
   webkit =
     builderDefsPackage ../development/libraries/webkit {