BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

flann: don't unbundle lz4 for clang

Browse source 
unbundling appears broken with the llvm toolchain:

https://github.com/flann-lib/flann/pull/399#issuecomment-1133601759
This commit is contained in:
Robert Scott 2022-05-21 15:34:01 +01:00
parent cb6fac46c1
commit aa5dd726dc
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/libraries/flann/default.nix
View file

@ -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 ];