vigra: 1.11.1 → unstable-2022-01-11
This commit is contained in:
parent
2b730c8d5c
commit
7022bcf5dc
|
@ -1,7 +1,6 @@
|
||||||
{ lib
|
{ lib
|
||||||
, stdenv
|
, stdenv
|
||||||
, fetchFromGitHub
|
, fetchFromGitHub
|
||||||
, fetchurl
|
|
||||||
, boost
|
, boost
|
||||||
, cmake
|
, cmake
|
||||||
, fftw
|
, fftw
|
||||||
|
@ -20,25 +19,17 @@ let
|
||||||
in
|
in
|
||||||
stdenv.mkDerivation rec {
|
stdenv.mkDerivation rec {
|
||||||
pname = "vigra";
|
pname = "vigra";
|
||||||
version = "1.11.1";
|
version = "unstable-2022-01-11";
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
src = fetchFromGitHub {
|
||||||
owner = "ukoethe";
|
owner = "ukoethe";
|
||||||
repo = "vigra";
|
repo = "vigra";
|
||||||
rev = "Version-${lib.replaceChars ["."] ["-"] version}";
|
rev = "093d57d15c8c237adf1704d96daa6393158ce299";
|
||||||
sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk=";
|
sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og=";
|
||||||
};
|
};
|
||||||
|
|
||||||
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR";
|
||||||
|
|
||||||
# Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414
|
|
||||||
patches =
|
|
||||||
let clangPatch = fetchurl {
|
|
||||||
url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch";
|
|
||||||
sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi";
|
|
||||||
};
|
|
||||||
in [ clangPatch ];
|
|
||||||
|
|
||||||
nativeBuildInputs = [ cmake ];
|
nativeBuildInputs = [ cmake ];
|
||||||
buildInputs = [
|
buildInputs = [
|
||||||
boost
|
boost
|
||||||
|
@ -59,9 +50,6 @@ stdenv.mkDerivation rec {
|
||||||
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
|
++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
|
||||||
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
|
[ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ];
|
||||||
|
|
||||||
# fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory"
|
|
||||||
doCheck = false;
|
|
||||||
|
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "Novel computer vision C++ library with customizable algorithms and data structures";
|
description = "Novel computer vision C++ library with customizable algorithms and data structures";
|
||||||
homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
|
homepage = "https://hci.iwr.uni-heidelberg.de/vigra";
|
||||||
|
|
Loading…
Reference in a new issue