b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #180146 from trofi/update-vxl-away-from-gcc6

Browse source 
vxl: 1.17.0-nix1 -> 3.3.2
This commit is contained in:
Sergei Trofimovich 2022-07-06 08:11:06 +01:00 committed by GitHub
parent 79f0470dc2 df304cc773
commit 195c7143d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
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

@ -21418,10 +21418,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 { };