From 06f6bb05591a80b043cae791e967203285f7f165 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 21 Dec 2012 10:53:10 +0100 Subject: [PATCH] vxl: fixing build with the new linux headers --- pkgs/development/libraries/vxl/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 01ccb23b77c..5f49c3351fa 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -9,7 +9,10 @@ stdenv.mkDerivation { buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; - cmakeFlags = "-DBUILD_TESTING=OFF " + (if (stdenv.system == "x86_64-linux") then + # BUILD_OUL wants old linux headers for videodev.h, not available + # in stdenv linux headers + cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF " + + (if (stdenv.system == "x86_64-linux") then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else "");