diff options
| author | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 00:07:55 +0100 |
|---|---|---|
| committer | Weijia Wang <9713184+wegank@users.noreply.github.com> | 2023-11-06 00:07:55 +0100 |
| commit | 524b9beb999a7bb97b83482f214a73b3c2e80e48 (patch) | |
| tree | 0ce84d3d85c1bb581a1c1865cd828a5f6063217a /pkgs/development/libraries/flann | |
| parent | b3fbf842deb24445770cc67d2806e09406c72798 (diff) | |
| download | nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar.gz nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar.bz2 nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar.lz nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar.xz nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.tar.zst nixpkgs-524b9beb999a7bb97b83482f214a73b3c2e80e48.zip | |
flann: fix build with clang 16
Diffstat (limited to 'pkgs/development/libraries/flann')
| -rw-r--r-- | pkgs/development/libraries/flann/default.nix | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index ec1715b005f..eeac7d14568 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -43,6 +43,12 @@ stdenv.mkDerivation rec { url = "https://github.com/flann-lib/flann/commit/25eb56ec78472bd419a121c6905095a793cf8992.patch"; sha256 = "qt8h576Gn8uR7+T9u9bEBIRz6e6AoTKpa1JfdZVvW9s="; }) + ] ++ lib.optionals stdenv.cc.isClang [ + # Fix build with Clang 16. + (fetchpatch { + url = "https://github.com/flann-lib/flann/commit/be80cefa69b314a3d9e1ab971715e84145863ebb.patch"; + hash = "sha256-4SUKzQCm0Sx8N43Z6ShuMbgbbe7q8b2Ibk3WgkB0qa4="; + }) ]; cmakeFlags = [ |