dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

freshBootstrapTools: run nixfmt

Browse Source
This commit is contained in:
Philip Taron 2024-08-02 17:19:37 -07:00
parent 2587d88ee8
commit e915f6b32e
No known key found for this signature in database
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -1,11 +1,21 @@
{ pkgs ? import ../../.. {} }:
{
pkgs ? import ../../.. { },
}:
let
inherit (pkgs) lib stdenv config;
libc = pkgs.stdenv.cc.libc;
patchelf = pkgs.patchelf.overrideAttrs(previousAttrs: {
NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or []) ++ [ "-static-libgcc" "-static-libstdc++" ];
NIX_CFLAGS_LINK = (previousAttrs.NIX_CFLAGS_LINK or []) ++ [ "-static-libgcc" "-static-libstdc++" ];
patchelf = pkgs.patchelf.overrideAttrs (previousAttrs: {
NIX_CFLAGS_COMPILE = (previousAttrs.NIX_CFLAGS_COMPILE or [ ]) ++ [
"-static-libgcc"
"-static-libstdc++"
];
NIX_CFLAGS_LINK = (previousAttrs.NIX_CFLAGS_LINK or [ ]) ++ [
"-static-libgcc"
"-static-libstdc++"
];
});
in
rec {
@ -35,6 +45,7 @@ rec {
};
bootGCC = pkgs.gcc.cc.override { enableLTO = false; };
bootBinutils = pkgs.binutils.bintools.override {
withAllTargets = false;
# Don't need two linkers, disable whatever's not primary/default.
@ -44,7 +55,15 @@ rec {
};
build = pkgs.callPackage ./stdenv-bootstrap-tools.nix {
inherit bootBinutils coreutilsMinimal tarMinimal busyboxMinimal bootGCC libc patchelf;
inherit
bootBinutils
coreutilsMinimal
tarMinimal
busyboxMinimal
bootGCC
libc
patchelf
;
};
inherit (build) bootstrapFiles;