Serene
/
bootstrap-toolchain
2
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Revert the toolchain changes for v15

This commit is contained in:
Sameer Rahmani 2023-09-04 09:49:09 +01:00
parent 03794fde6a
commit 7e408592d9
Signed by: lxsameer
GPG Key ID: B0A4AF28AB9FD90B
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
default.nix
View File

@ -1,5 +1,6 @@
{ {
nixPkgsVersion ? "3e52e76b70d5508f3cec70b882a29199f4d1ee85" nixPkgsVersion ? "3e52e76b70d5508f3cec70b882a29199f4d1ee85",
currentSystem
}: }:
let let
@ -12,21 +13,17 @@ let
rev = nixPkgsVersion; rev = nixPkgsVersion;
}) args; }) args;
nixpkgs = getNixPkgs {}; nixpkgs = getNixPkgs { system = currentSystem; };
system = import ./system.nix { pkgs = nixpkgs; }; system = import ./system.nix {
pkgs = nixpkgs;
inherit currentSystem;
};
staticMuslPkgs = getNixPkgs system; staticMuslPkgs = getNixPkgs system;
llvm = staticMuslPkgs.llvmPackages_16.override { stdenv = staticMuslPkgs.llvmPackages_16.libcxxClang; }; llvm = staticMuslPkgs.llvmPackages_16.override { stdenv = staticMuslPkgs.llvmPackages_16.libcxxStdenv; };
SereneOverlay = final: prev:
{
sereneToolchain = llvm.libcxxClang;
};
createPkgSet = _: # It has to be the nixpkgs instance createPkgSet = _: # It has to be the nixpkgs instance
getNixPkgs (system // { overlays = [ SereneOverlay ]; }); getNixPkgs (system // { config.replaceStdenv = _: llvm.libcxxStdenv; });
#pkgs = getNixPkgs nixVersion (system // { overlays = [ libcxxClangOverlay ]; });
in {
inherit SereneOverlay createPkgSet;
# setupToolchain = nixpkgs:
#pkgs.stdenv.override { stdenv = llvm.libcxxClang; }; in {
inherit createPkgSet;
} }

6
system.nix
View File

@ -1,11 +1,11 @@
{ pkgs }: { pkgs, currentSystem }:
let let
parsedSystem = builtins.split "-" builtins.currentSystem; parsedSystem = builtins.split "-" currentSystem;
arch = builtins.head (parsedSystem); arch = builtins.head (parsedSystem);
os = builtins.elemAt (parsedSystem) 2; os = builtins.elemAt (parsedSystem) 2;
system = pkgs.lib.systems.elaborate { system = pkgs.lib.systems.elaborate {
system = builtins.currentSystem; system = currentSystem;
config = "${arch}-unknown-linux-musl"; config = "${arch}-unknown-linux-musl";
isStatic = true; isStatic = true;
useLLVM = true; useLLVM = true;