From f529e915012ed515ddbd10b4fd6c24eda7647a73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 30 Dec 2013 15:32:19 +0100 Subject: [PATCH] Updating vxl from 1.13 to 1.17. --- pkgs/development/libraries/vxl/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/vxl/default.nix b/pkgs/development/libraries/vxl/default.nix index 2f169f3f25d..e181ade4d6c 100644 --- a/pkgs/development/libraries/vxl/default.nix +++ b/pkgs/development/libraries/vxl/default.nix @@ -1,17 +1,18 @@ { stdenv, fetchurl, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: stdenv.mkDerivation { - name = "vxl-1.13.0"; + name = "vxl-1.17.0"; src = fetchurl { - url = mirror://sourceforge/vxl/vxl-1.13.0.zip; - sha256 = "05xk9dfkqsznp1dic8rcsdhgdp12bikwx1zpci0w3s20fs8q8nn1"; + url = mirror://sourceforge/vxl/vxl-1.17.0.zip; + sha256 = "1qg7i8h201pa8jljg7vph4rlxk6n5cj9f9gd1hkkmbw6fh44lsxh"; }; buildInputs = [ cmake unzip libtiff expat zlib libpng libjpeg ]; # BUILD_OUL wants old linux headers for videodev.h, not available # in stdenv linux headers - cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF " + # BUILD_BRL fails to find open() + cmakeFlags = "-DBUILD_TESTING=OFF -DBUILD_OUL=OFF -DBUILD_BRL=OFF -DBUILD_CONTRIB=OFF " + (if stdenv.system == "x86_64-linux" then "-DCMAKE_CXX_FLAGS=-fPIC -DCMAKE_C_FLAGS=-fPIC" else