Merge pull request #180146 from trofi/update-vxl-away-from-gcc6
vxl: 1.17.0-nix1 -> 3.3.2
This commit is contained in:
commit
195c7143d9
|
@ -1,30 +1,18 @@
|
||||||
{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
|
{ lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }:
|
||||||
stdenv.mkDerivation {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vxl";
|
pname = "vxl";
|
||||||
version = "1.17.0-nix1";
|
version = "3.3.2";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "vxl";
|
owner = "vxl";
|
||||||
repo = "vxl";
|
repo = "vxl";
|
||||||
rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a";
|
rev = "v${version}";
|
||||||
sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8";
|
sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr";
|
||||||
};
|
};
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake unzip ];
|
nativeBuildInputs = [ cmake unzip ];
|
||||||
buildInputs = [ libtiff expat zlib libpng libjpeg ];
|
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 = {
|
meta = {
|
||||||
description = "C++ Libraries for Computer Vision Research and Implementation";
|
description = "C++ Libraries for Computer Vision Research and Implementation";
|
||||||
homepage = "http://vxl.sourceforge.net/";
|
homepage = "http://vxl.sourceforge.net/";
|
||||||
|
|
|
@ -21418,10 +21418,7 @@ with pkgs;
|
||||||
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
|
vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { };
|
||||||
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
|
vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { };
|
||||||
|
|
||||||
vxl = callPackage ../development/libraries/vxl {
|
vxl = callPackage ../development/libraries/vxl { };
|
||||||
libpng = libpng12;
|
|
||||||
stdenv = gcc6Stdenv; # upstream code incompatible with gcc7
|
|
||||||
};
|
|
||||||
|
|
||||||
waffle = callPackage ../development/libraries/waffle { };
|
waffle = callPackage ../development/libraries/waffle { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue