diff --git a/pkgs/os-specific/linux/minimal-bootstrap/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
index 061727a47063..4c4b461f2f13 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/default.nix
@@ -75,7 +75,7 @@ lib.makeScope
 
       gawk-mes = callPackage ./gawk/mes.nix {
         bash = bash_2_05;
-        tinycc = tinycc-mes;
+        tinycc = tinycc-bootstrappable;
         gnused = gnused-mes;
       };
 
@@ -123,7 +123,7 @@ lib.makeScope
         tinycc = tinycc-mes;
       };
 
-      gnumake = callPackage ./gnumake { tinycc = tinycc-mes; };
+      gnumake = callPackage ./gnumake { tinycc = tinycc-bootstrappable; };
 
       gnumake-musl = callPackage ./gnumake/musl.nix {
         bash = bash_2_05;
@@ -141,7 +141,7 @@ lib.makeScope
       };
       gnused-mes = callPackage ./gnused/mes.nix {
         bash = bash_2_05;
-        tinycc = tinycc-mes;
+        tinycc = tinycc-bootstrappable;
       };
 
       gnutar = callPackage ./gnutar/mes.nix {
@@ -165,13 +165,13 @@ lib.makeScope
 
       gzip = callPackage ./gzip {
         bash = bash_2_05;
-        tinycc = tinycc-mes;
+        tinycc = tinycc-bootstrappable;
         gnused = gnused-mes;
       };
 
       heirloom = callPackage ./heirloom {
         bash = bash_2_05;
-        tinycc = tinycc-mes;
+        tinycc = tinycc-bootstrappable;
       };
 
       heirloom-devtools = callPackage ./heirloom-devtools { tinycc = tinycc-mes; };
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix
index 4ec34686cb57..fc762a956aa2 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/1.1.nix
@@ -54,12 +54,8 @@ let
       url = "${liveBootstrap}/patches/sigsetjmp.patch";
       hash = "sha256-wd2Aev1zPJXy3q933aiup5p1IMKzVJBquAyl3gbK4PU=";
     })
-    # FIXME: this patch causes the build to fail
-    # (fetchurl {
-    #   url = "${liveBootstrap}/patches/stdio_flush_on_exit.patch";
-    #   hash = "sha256-/z5ze3h3QTysay8nRvyvwPv3pmTcKptdkBIaMCoeLDg=";
-    # })
     # HACK: always flush stdio immediately
+    # Do not remove atm, gcc 4.6 does not build without this patch applied.
     ./always-flush.patch
     (fetchurl {
       url = "${liveBootstrap}/patches/va_list.patch";
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
index 138e530efb5d..79ca931501d6 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/musl/default.nix
@@ -14,11 +14,11 @@
 }:
 let
   inherit (import ./common.nix { inherit lib; }) pname meta;
-  version = "1.2.4";
+  version = "1.2.5";
 
   src = fetchurl {
     url = "https://musl.libc.org/releases/musl-${version}.tar.gz";
-    hash = "sha256-ejXq4z1TcqfA2hGI3nmHJvaIJVE7euPr6XqqpSEU8Dk=";
+    hash = "sha256-qaEYu+hNh2TaDqDSizqz+uhHf8fkCF2QECuFlvx8deQ=";
   };
 in
 bash.runCommand "${pname}-${version}"
diff --git a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix
index 9a9c26f6171f..62f69fe1c24f 100644
--- a/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix
+++ b/pkgs/os-specific/linux/minimal-bootstrap/tinycc/musl.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchurl,
-  callPackage,
   bash,
   tinycc-bootstrappable,
   musl,