diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-02-28 06:01:38 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-02-28 06:01:38 +0000 |
commit | 51c18e4be12fd2ff36f79abdbee0c6e1582cc466 (patch) | |
tree | 0c7e6f0d74e6dc7358e182433c2ecb8999f7504f /pkgs/development/compilers/llvm/7 | |
parent | 387a5e220d4ddc69b31ec9b1c5f1f322ccd149a9 (diff) | |
parent | f610d5f5d6ecb7d74dc20d99bf97bf8ab5bfbf2a (diff) |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/compilers/llvm/7')
-rw-r--r-- | pkgs/development/compilers/llvm/7/default.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/compilers/llvm/7/default.nix b/pkgs/development/compilers/llvm/7/default.nix index 7ddd14b60d3db..3fc0b359ad6c2 100644 --- a/pkgs/development/compilers/llvm/7/default.nix +++ b/pkgs/development/compilers/llvm/7/default.nix @@ -65,7 +65,7 @@ let # `llvm` historically had the binaries. When choosing an output explicitly, # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get* - llvm = tools.libllvm.out // { outputSpecified = false; }; + llvm = tools.libllvm; libllvm-polly = callPackage ./llvm { inherit llvm_meta; @@ -78,7 +78,7 @@ let inherit clang-tools-extra_src llvm_meta; }; - clang-unwrapped = tools.libclang.out // { outputSpecified = false; }; + clang-unwrapped = tools.libclang; clang-polly-unwrapped = callPackage ./clang { inherit llvm_meta; |