christoph/flake-nixinator
1
Fork 0
Code Activity

Update compilers for C/C++ flakes

Browse Source
This commit is contained in:
Christoph Urlacher
2023-11-13 15:22:19 +01:00
parent f86136a728
commit 7997545c02
2 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
env/flake_c++-with-libs.nix vendored
View File

@ -23,13 +23,13 @@
bintools = pkgs.bintools.bintools; bintools = pkgs.bintools.bintools;
libc = pkgs.glibc; libc = pkgs.glibc;
}; };
gcc12 = pkgs.hiPrio (pkgs.wrapCCWith { gcc13 = pkgs.hiPrio (pkgs.wrapCCWith {
cc = pkgs.gcc12.cc; cc = pkgs.gcc13.cc;
libc = pkgs.glibc; libc = pkgs.glibc;
bintools = bintools; bintools = bintools;
}); });
clang15 = pkgs.wrapCCWith { clang16 = pkgs.wrapCCWith {
cc = pkgs.clang_15.cc; cc = pkgs.clang_16.cc;
libc = pkgs.glibc; libc = pkgs.glibc;
bintools = bintools; bintools = bintools;
}; };
@ -39,13 +39,13 @@
bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
}; };
gcc12_multi = pkgs.hiPrio (pkgs.wrapCCWith { gcc13_multi = pkgs.hiPrio (pkgs.wrapCCWith {
cc = pkgs.gcc12.cc; # Get the unwrapped gcc from the wrapper cc = pkgs.gcc13.cc; # Get the unwrapped gcc from the wrapper
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
bintools = bintools_multi; bintools = bintools_multi;
}); });
clang15_multi = pkgs.wrapCCWith { clang16_multi = pkgs.wrapCCWith {
cc = pkgs.clang_15.cc; cc = pkgs.clang_16.cc;
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
bintools = bintools_multi; bintools = bintools_multi;
}; };
@ -57,11 +57,11 @@
packages = with pkgs; [ packages = with pkgs; [
# Compilers # Compilers
bintools bintools
gcc12 gcc13
clang15 clang16
# bintools_multi # bintools_multi
# gcc12_multi # gcc13_multi
# clang14_multi # clang15_multi
# Native buildinputs # Native buildinputs
gnumake gnumake

24
env/flake_c++.nix vendored
View File

@ -23,13 +23,13 @@
bintools = pkgs.bintools.bintools; bintools = pkgs.bintools.bintools;
libc = pkgs.glibc; libc = pkgs.glibc;
}; };
gcc12 = pkgs.hiPrio (pkgs.wrapCCWith { gcc13 = pkgs.hiPrio (pkgs.wrapCCWith {
cc = pkgs.gcc12.cc; cc = pkgs.gcc13.cc;
libc = pkgs.glibc; libc = pkgs.glibc;
bintools = bintools; bintools = bintools;
}); });
clang15 = pkgs.wrapCCWith { clang16 = pkgs.wrapCCWith {
cc = pkgs.clang_15.cc; cc = pkgs.clang_16.cc;
libc = pkgs.glibc; libc = pkgs.glibc;
bintools = bintools; bintools = bintools;
}; };
@ -39,13 +39,13 @@
bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper bintools = pkgs.bintools.bintools; # Get the unwrapped bintools from the wrapper
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
}; };
gcc12_multi = pkgs.hiPrio (pkgs.wrapCCWith { gcc13_multi = pkgs.hiPrio (pkgs.wrapCCWith {
cc = pkgs.gcc12.cc; # Get the unwrapped gcc from the wrapper cc = pkgs.gcc13.cc; # Get the unwrapped gcc from the wrapper
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
bintools = bintools_multi; bintools = bintools_multi;
}); });
clang15_multi = pkgs.wrapCCWith { clang16_multi = pkgs.wrapCCWith {
cc = pkgs.clang_15.cc; cc = pkgs.clang_16.cc;
libc = pkgs.glibc_multi; libc = pkgs.glibc_multi;
bintools = bintools_multi; bintools = bintools_multi;
}; };
@ -55,11 +55,11 @@
buildInputs = with pkgs; [ buildInputs = with pkgs; [
# Compilers # Compilers
bintools bintools
gcc12 gcc13
clang15 clang16
# bintools_multi # bintools_multi
# gcc12_multi # gcc13_multi
# clang14_multi # clang15_multi
# Native buildinputs # Native buildinputs
gnumake gnumake