pyrox.dev
flann: don't unbundle lz4 for clang
unbundling appears broken with the llvm toolchain:
https://github.com/flann-lib/flann/pull/399#issuecomment-1133601759
+3
-1
pkgs/development/libraries/flann/default.nix
+3
-1
pkgs/development/libraries/flann/default.nix
···
32
32
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";
33
33
sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4=";
34
34
})
35
+
] ++ lib.optionals (!stdenv.cc.isClang) [
35
36
# Avoid the bundled version of LZ4 and instead use the system one.
36
37
(fetchpatch {
37
38
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
58
unzip
58
59
];
59
60
60
-
propagatedBuildInputs = [ lz4 ];
61
+
# lz4 unbundling broken for llvm, use internal version
62
+
propagatedBuildInputs = lib.optional (!stdenv.cc.isClang) lz4;
61
63
62
64
buildInputs = lib.optionals enablePython [ python3 ];
63
65