nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 23:13:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

vxl: 1.17.0-nix1 -> 3.3.2

Browse Source 
While at it drop pin to gcc6 and outdated jpeg.
This commit is contained in:
Sergei Trofimovich 2022-07-04 18:27:14 +01:00
parent d335ada6fe
commit df304cc773
2 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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/";

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

@ -21402,10 +21402,7 @@ with pkgs;
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
vxl = callPackage ../development/libraries/vxl {
libpng = libpng12;
stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
};
vxl = callPackage ../development/libraries/vxl { };
waffle = callPackage ../development/libraries/waffle { };