Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix shell.nix use llvmPackages.bintools with wrapper for rpath config #14583

Merged
merged 1 commit into from
May 13, 2024
Merged

Fix shell.nix use llvmPackages.bintools with wrapper for rpath config #14583

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 9 additions & 9 deletions shell.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,39 +72,39 @@ let
llvm_suite = ({
llvm_16 = {
llvm = pkgs.llvm_16;
extra = [ pkgs.lld_16 pkgs.lldb_16 ];
extra = [ pkgs.llvmPackages_16.bintools pkgs.lldb_16 ];
};
llvm_15 = {
llvm = pkgs.llvm_15;
extra = [ pkgs.lld_15 pkgs.lldb_15 ];
extra = [ pkgs.llvmPackages_15.bintools pkgs.lldb_15 ];
};
llvm_14 = {
llvm = pkgs.llvm_14;
extra = [ pkgs.lld_14 pkgs.lldb_14 ];
extra = [ pkgs.llvmPackages_14.bintools pkgs.lldb_14 ];
};
llvm_13 = {
llvm = pkgs.llvm_13;
extra = [ pkgs.lld_13 pkgs.lldb_13 ];
extra = [ pkgs.llvmPackages_13.bintools pkgs.lldb_13 ];
};
llvm_12 = {
llvm = pkgs.llvm_12;
extra = [ pkgs.lld_12 pkgs.lldb_12 ];
extra = [ pkgs.llvmPackages_12.bintools pkgs.lldb_12 ];
};
llvm_11 = {
llvm = pkgs.llvm_11;
extra = [ pkgs.lld_11 pkgs.lldb_11 ];
extra = [ pkgs.llvmPackages_11.bintools pkgs.lldb_11 ];
};
llvm_10 = {
llvm = pkgs.llvm_10;
extra = [ pkgs.lld_10 ]; # lldb marked as broken
extra = [ pkgs.llvmPackages_10.bintools ]; # lldb marked as broken
};
llvm_9 = {
llvm = pkgs.llvm_9;
extra = [ pkgs.lld_9 ]; # lldb marked as broken
extra = [ pkgs.llvmPackages_9.bintools ]; # lldb marked as broken
};
llvm_8 = {
llvm = pkgs.llvm_8;
extra = [ pkgs.lld_8 ]; # lldb marked as broken
extra = [ pkgs.llvmPackages_8.bintools ]; # lldb marked as broken
};
}."llvm_${toString llvm}");

Expand Down