lol

vxl: 1.17.0-nix1 -> 3.3.2

While at it drop pin to gcc6 and outdated jpeg.

+5 -20
+4 -16
pkgs/development/libraries/vxl/default.nix
··· 1 1 { lib, stdenv, fetchFromGitHub, unzip, cmake, libtiff, expat, zlib, libpng, libjpeg }: 2 - stdenv.mkDerivation { 2 + stdenv.mkDerivation rec { 3 3 pname = "vxl"; 4 - version = "1.17.0-nix1"; 4 + version = "3.3.2"; 5 5 6 6 src = fetchFromGitHub { 7 7 owner = "vxl"; 8 8 repo = "vxl"; 9 - rev = "777c0beb7c8b30117400f6fc9a6d63bf8cb7c67a"; 10 - sha256 = "0xpkwwb93ka6c3da8zjhfg9jk5ssmh9ifdh1by54sz6c7mbp55m8"; 9 + rev = "v${version}"; 10 + sha256 = "0qmqrijl14xlsbd77jk9ygg44h3lqzpswia6yif1iia6smqccjsr"; 11 11 }; 12 12 13 13 nativeBuildInputs = [ cmake unzip ]; 14 14 buildInputs = [ libtiff expat zlib libpng libjpeg ]; 15 - 16 - cmakeFlags = [ 17 - # BUILD_OUL wants old linux headers for videodev.h, not available 18 - # in stdenv linux headers 19 - "-DBUILD_OUL=OFF" 20 - # BUILD_BRL fails to find open() 21 - "-DBUILD_BRL=OFF" 22 - "-DBUILD_CONTRIB=OFF" 23 - ] ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ 24 - "-DCMAKE_CXX_FLAGS=-fPIC" 25 - "-DCMAKE_C_FLAGS=-fPIC" 26 - ]; 27 15 28 16 meta = { 29 17 description = "C++ Libraries for Computer Vision Research and Implementation";
+1 -4
pkgs/top-level/all-packages.nix
··· 21402 21402 vulkan-tools-lunarg = callPackage ../tools/graphics/vulkan-tools-lunarg { }; 21403 21403 vulkan-validation-layers = callPackage ../development/tools/vulkan-validation-layers { }; 21404 21404 21405 - vxl = callPackage ../development/libraries/vxl { 21406 - libpng = libpng12; 21407 - stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 21408 - }; 21405 + vxl = callPackage ../development/libraries/vxl { }; 21409 21406 21410 21407 waffle = callPackage ../development/libraries/waffle { }; 21411 21408