diff options
author | Robert Scott <code@humanleg.org.uk> | 2022-05-21 15:34:01 +0100 |
---|---|---|
committer | Robert Scott <code@humanleg.org.uk> | 2022-05-21 15:34:01 +0100 |
commit | aa5dd726dccfe2415b03e0cc4ce4a39c44827474 (patch) | |
tree | c64876f17da918d3152e84d01dc3f37018ba3a89 | |
parent | cb6fac46c1cba416a7ae76064f1fdb769399e55d (diff) | |
download | nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar.gz nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar.bz2 nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar.lz nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar.xz nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.tar.zst nixpkgs-aa5dd726dccfe2415b03e0cc4ce4a39c44827474.zip |
flann: don't unbundle lz4 for clang
unbundling appears broken with the llvm toolchain: https://github.com/flann-lib/flann/pull/399#issuecomment-1133601759
-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 ]; |