lol

vigra: 1.11.1 → unstable-2022-01-11

+3 -15
+3 -15
pkgs/development/libraries/vigra/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchFromGitHub 4 - , fetchurl 5 4 , boost 6 5 , cmake 7 6 , fftw ··· 20 19 in 21 20 stdenv.mkDerivation rec { 22 21 pname = "vigra"; 23 - version = "1.11.1"; 22 + version = "unstable-2022-01-11"; 24 23 25 24 src = fetchFromGitHub { 26 25 owner = "ukoethe"; 27 26 repo = "vigra"; 28 - rev = "Version-${lib.replaceChars ["."] ["-"] version}"; 29 - sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk="; 27 + rev = "093d57d15c8c237adf1704d96daa6393158ce299"; 28 + sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og="; 30 29 }; 31 30 32 31 NIX_CFLAGS_COMPILE = "-I${ilmbase.dev}/include/OpenEXR"; 33 32 34 - # Fixes compilation with clang (on darwin) see https://github.com/ukoethe/vigra/issues/414 35 - patches = 36 - let clangPatch = fetchurl { 37 - url = "https://github.com/ukoethe/vigra/commit/81958d302494e137f98a8b1d7869841532f90388.patch"; 38 - sha256 = "1i1w6smijgb5z8bg9jaq84ccy00k2sxm87s37lgjpyix901gjlgi"; 39 - }; 40 - in [ clangPatch ]; 41 - 42 33 nativeBuildInputs = [ cmake ]; 43 34 buildInputs = [ 44 35 boost ··· 58 49 cmakeFlags = [ "-DWITH_OPENEXR=1" ] 59 50 ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") 60 51 [ "-DCMAKE_CXX_FLAGS=-fPIC" "-DCMAKE_C_FLAGS=-fPIC" ]; 61 - 62 - # fails with "./test_watersheds3d: error while loading shared libraries: libvigraimpex.so.11: cannot open shared object file: No such file or directory" 63 - doCheck = false; 64 52 65 53 meta = with lib; { 66 54 description = "Novel computer vision C++ library with customizable algorithms and data structures";