From 804b8a84fa952f788ca8f81e62c716c0455ed3b3 Mon Sep 17 00:00:00 2001 From: Aleksi Hannula Date: Fri, 7 Aug 2026 19:29:05 +0300 Subject: [PATCH] minimal-bootstrap.gcc10: Use wrapper --- pkgs/os-specific/linux/minimal-bootstrap/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix index d7fe80400282..4096a1d927ee 100644 --- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix +++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix @@ -150,11 +150,21 @@ lib.makeScope gnutar = gnutar-musl; }; - gcc10 = callPackage ./gcc/10.nix { + gcc10-unwrapped = callPackage ./gcc/10.nix { gcc = gcc46-cxx; gnumake = gnumake-musl; gnutar = gnutar-latest; }; + gcc10 = callPackage ./gcc/wrapper.nix { + gcc-unwrapped = gcc10-unwrapped; + bash-build = bash; + libc = musl; + libgcc = gcc10-unwrapped; + libstdcxx = gcc10-unwrapped; + targetPlatform = hostPlatform; + dynamicLinkerGlob = "${musl}/lib/libc.so"; + staticLibgcc = true; + }; gcc-latest-unwrapped = callPackage ./gcc/latest.nix { gcc = gcc10;