diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index 6146c51e2d00..279be22f7757 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -36,6 +36,8 @@ devExtraCmakeFlags ? [ ], getVersionFile, fetchpatch, + # for tests + libllvm, }: let @@ -206,8 +208,6 @@ stdenv.mkDerivation ( ++ lib.optionals enablePolly [ # Just like the `gnu-install-dirs` patch, but for `polly`. (getVersionFile "llvm/gnu-install-dirs-polly.patch") - ] - ++ [ # Just like the `llvm-lit-cfg` patch, but for `polly`. (getVersionFile "llvm/polly-lit-cfg-add-libs-to-dylib-path.patch") ] @@ -591,8 +591,15 @@ stdenv.mkDerivation ( checkTarget = "check-all"; - # For the update script: - passthru.monorepoSrc = monorepoSrc; + passthru = { + # For the update script: + inherit monorepoSrc; + tests.withoutOptionalFeatures = libllvm.override { + enablePFM = false; + enablePolly = false; + enableTerminfo = false; + }; + }; requiredSystemFeatures = [ "big-parallel" ]; meta = llvm_meta // {