Author: viric
Date: Wed Mar 7 10:16:53 2012
New Revision: 32848
URL: https://nixos.org/websvn/nix/?rev=32848&sc=1
Log:
Fixing the vxl build.
Modified:
nixpkgs/trunk/pkgs/development/libraries/vxl/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/development/libraries/vxl/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/vxl/default.nix Wed Mar 7
09:47:22 2012 (r32847)
+++ nixpkgs/trunk/pkgs/development/libraries/vxl/default.nix Wed Mar 7
10:16:53 2012 (r32848)
@@ -9,11 +9,12 @@
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";
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 7 09:47:22
2012 (r32847)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Wed Mar 7 10:16:53
2012 (r32848)
@@ -4728,7 +4728,9 @@
vtk = callPackage ../development/libraries/vtk { };
- vxl = callPackage ../development/libraries/vxl { };
+ vxl = callPackage ../development/libraries/vxl {
+ libpng = libpng12;
+ };
webkit =
builderDefsPackage ../development/libraries/webkit {
_______________________________________________
nix-commits mailing list
nix-comm...@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-commits
