From ef568bf192fed23432179c3f0e6a3f6ab513062c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
<viric@vicerveza.homeunix.net>
Date: Wed, 7 Mar 2012 10:16:53 +0000
Subject: [PATCH] Fixing the vxl build.
svn path=/nixpkgs/trunk/; revision=32848
---
pkgs/development/libraries/vxl/default.nix | 7 ++++---
pkgs/top-level/all-packages.nix | 4 +++-
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix
index c9ba078a6fab..01ccb23b77cf 100644
--- a/pkgs/development/libraries/vxl/default.nix
+++ b/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";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7286ef37b892..6c810d1f4330 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/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 {