fix: microkit to completely unwrapped toolchains

DLR-FT · Oct 28, 2024 · 40fe61c · 40fe61c
1 parent 00bc4c1
commit 40fe61c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/flake.nix b/flake.nix
@@ -533,9 +533,9 @@
 
         devShells.microkit = pkgs.mkShell.override { stdenv = pkgs.stdenvNoCC; } {
           nativeBuildInputs = with pkgs; [
-            pkgsCross.aarch64-multiplatform.stdenv.cc
-            pkgsCross.aarch64-multiplatform.stdenv.cc.bintools
-            pkgsCross.riscv64-embedded.stdenv.cc.bintools
+            pkgsCross.aarch64-multiplatform.stdenv.cc.bintools.bintools
+            pkgsCross.aarch64-multiplatform.stdenv.cc.cc
+            pkgsCross.riscv64-embedded.stdenv.cc.bintools.bintools
             pkgsCross.riscv64-embedded.stdenv.cc.cc
             bear
             gnumake

diff --git a/pkgs/microkit-sdk.nix b/pkgs/microkit-sdk.nix
@@ -70,9 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
     # We want the unwrapped cc, Nix usually injects some compiler flags that might collide with
     # seL4's way of building things. However, the unwrapped compiler (stdenv.cc.cc) does not contain
     # bintools, so we have to import them as well.
-    pkgsCross.aarch64-embedded.stdenv.cc.bintools
+    pkgsCross.aarch64-embedded.stdenv.cc.bintools.bintools
     pkgsCross.aarch64-embedded.stdenv.cc.cc
-    pkgsCross.riscv64-embedded.stdenv.cc.bintools
+    pkgsCross.riscv64-embedded.stdenv.cc.bintools.bintools
     pkgsCross.riscv64-embedded.stdenv.cc.cc
 
     # microkit-sdk dependencies