diff options
| author | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-03-28 13:23:42 -0600 |
|---|---|---|
| committer | Fabián Heredia Montiel <fabianhjr@protonmail.com> | 2022-04-23 12:19:52 -0500 |
| commit | 7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966 (patch) | |
| tree | fe9f236c22803084acd031617f73a7663cfc3a56 | |
| parent | 2b730c8d5c26d85ecd6678f83d425830681d77c2 (diff) | |
| download | nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar.gz nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar.bz2 nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar.lz nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar.xz nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.tar.zst nixpkgs-7022bcf5dc17dc47fb9ac4ebfa6e0fd57cdba966.zip | |
vigra: 1.11.1 → unstable-2022-01-11
| -rw-r--r-- | pkgs/development/libraries/vigra/default.nix | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/pkgs/development/libraries/vigra/default.nix b/pkgs/development/libraries/vigra/default.nix index a4371e7d1a5..32b97f8ea2d 100644 --- a/pkgs/development/libraries/vigra/default.nix +++ b/pkgs/development/libraries/vigra/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchurl , boost , cmake , fftw @@ -20,25 +19,17 @@ let in stdenv.mkDerivation rec { pname = "vigra"; - version = "1.11.1"; + version = "unstable-2022-01-11"; src = fetchFromGitHub { owner = "ukoethe"; repo = "vigra"; - rev = "Version-${lib.replaceChars ["."] ["-"] version}"; - sha256 = "sha256-tD6tdoT4mWBtzkn4Xv3nNIkBQmeqNqzI1AVxUbP76Mk="; + rev = "093d57d15c8c237adf1704d96daa6393158ce299"; + sha256 = "sha256-pFANoT00Wkh1/Dyd2x75IVTfyaoVA7S86tafUSr29Og="; }; 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 ]; buildInputs = [ boost @@ -59,9 +50,6 @@ stdenv.mkDerivation rec { ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ "-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; { description = "Novel computer vision C++ library with customizable algorithms and data structures"; homepage = "https://hci.iwr.uni-heidelberg.de/vigra"; |