public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixing the vxl build. 

svn path=/nixpkgs/trunk/; revision=32848
This commit is contained in:
Lluís Batlle i Rossell 2012-03-07 10:16:53 +00:00
parent ed325cd1ae
commit ef568bf192
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pkgs/development/libraries/vxl/default.nix
View File

@ -9,11 +9,12 @@ stdenv.mkDerivation {
buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; 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" "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC"
else else
""; "");
enableParallelBuilding = true;
meta = { meta = {
description = "C++ Libraries for Computer Vision Research and Implementation"; description = "C++ Libraries for Computer Vision Research and Implementation";

4
pkgs/top-level/all-packages.nix
View File

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