diff options
Diffstat (limited to 'pkgs/development/libraries/flann/default.nix')
| -rw-r--r-- | pkgs/development/libraries/flann/default.nix | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index c294aec893a..ec1715b005f 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0001-src-cpp-fix-cmake-3.11-build.patch"; sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4="; }) + ] ++ lib.optionals (!stdenv.cc.isClang) [ # Avoid the bundled version of LZ4 and instead use the system one. (fetchpatch { url = "https://salsa.debian.org/science-team/flann/-/raw/debian/1.9.1+dfsg-9/debian/patches/0003-Use-system-version-of-liblz4.patch"; @@ -57,7 +58,8 @@ stdenv.mkDerivation rec { unzip ]; - propagatedBuildInputs = [ lz4 ]; + # lz4 unbundling broken for llvm, use internal version + propagatedBuildInputs = lib.optional (!stdenv.cc.isClang) lz4; buildInputs = lib.optionals enablePython [ python3 ]; |