about summary refs log tree commit diff
path: root/nixpkgs/pkgs/development/libraries/vxl
diff options
context:
space:
mode:
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vxl')
-rw-r--r--nixpkgs/pkgs/development/libraries/vxl/default.nix20
1 files changed, 4 insertions, 16 deletions
diff --git a/nixpkgs/pkgs/development/libraries/vxl/default.nix b/nixpkgs/pkgs/development/libraries/vxl/default.nix
index d87adabf56c6..878271b43178 100644
--- a/nixpkgs/pkgs/development/libraries/vxl/default.nix
+++ b/nixpkgs/pkgs/development/libraries/vxl/default.nix
@@ -1,30 +1,18 @@
 { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   pname = "vxl";
-  version = "1.17.0-nix1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "vxl";
     repo = "vxl";
-    rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a";
-    sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
+    rev = "v${version}";
+    sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr";
   };
 
   nativeBuildInputs = [ cmake unzip ];
   buildInputs = [ libtiff expat zlib libpng libjpeg ];
 
-  cmakeFlags = [
-    # BUILD_OUL wants old linux headers for videodev.h, not available
-    # in stdenv linux headers
-    "-DBUILD_OUL=OFF"
-    # BUILD_BRL fails to find open()
-    "-DBUILD_BRL=OFF"
-    "-DBUILD_CONTRIB=OFF"
-  ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [
-    "-DCMAKE_CXX_FLAGS=-fPIC"
-    "-DCMAKE_C_FLAGS=-fPIC"
-  ];
-
   meta = {
     description = "C++ Libraries for Computer Vision Research and Implementation";
     homepage = "http://vxl.sourceforge.net/";