flann: don't unbundle lz4 for clang
unbundling appears broken with the llvm toolchain: https://github.com/flann-lib/flann/pull/399#issuecomment-1133601759
This commit is contained in:
parent
cb6fac46c1
commit
aa5dd726dc
|
@ -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";
|
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=";
|
sha256 = "REsBnbe6vlrZ+iCcw43kR5wy2o6q10RM73xjW5kBsr4=";
|
||||||
})
|
})
|
||||||
|
] ++ lib.optionals (!stdenv.cc.isClang) [
|
||||||
# Avoid the bundled version of LZ4 and instead use the system one.
|
# Avoid the bundled version of LZ4 and instead use the system one.
|
||||||
(fetchpatch {
|
(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";
|
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
|
unzip
|
||||||
];
|
];
|
||||||
|
|
||||||
propagatedBuildInputs = [ lz4 ];
|
# lz4 unbundling broken for llvm, use internal version
|
||||||
|
propagatedBuildInputs = lib.optional (!stdenv.cc.isClang) lz4;
|
||||||
|
|
||||||
buildInputs = lib.optionals enablePython [ python3 ];
|
buildInputs = lib.optionals enablePython [ python3 ];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue