diff options
| author | Alyssa Ross <hi@alyssa.is> | 2022-12-06 19:57:55 +0000 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-02-08 13:48:30 +0000 |
| commit | bf3aadfdd39aa197e18bade671fab6726349ffa4 (patch) | |
| tree | 698567af766ed441d757b57a7b21e68d4a342a2b /nixpkgs/pkgs/development/libraries/vxl | |
| parent | f4afc5a01d9539ce09e47494e679c51f80723d07 (diff) | |
| parent | 99665eb45f58d959d2cb9e49ddb960c79d596f33 (diff) | |
| download | nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.gz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.bz2 nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.lz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.xz nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.tar.zst nixlib-bf3aadfdd39aa197e18bade671fab6726349ffa4.zip | |
Merge commit '99665eb45f58d959d2cb9e49ddb960c79d596f33'
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/vxl')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/vxl/default.nix | 20 |
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/"; |