nix: Fix for stable rust toolchain

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Sep 18, 2024 · be5a66c · be5a66c
1 parent e34b5ac
commit be5a66c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/hacking/nix/scope/microkit/default.nix b/hacking/nix/scope/microkit/default.nix
@@ -93,7 +93,7 @@ let
       cargoConfigFile = toTOMLFile "config.toml" vendoredLockfile.configFragment;
 
     in
-      stdenv.mkDerivation {
+      stdenv.mkDerivation ({
         name = "microkit-sdk-just-tool";
 
         src = lib.cleanSource (microkitSource + "/tool/microkit");
@@ -106,6 +106,11 @@ let
           buildPackages.stdenv.cc
         ];
 
+      } // lib.optionalAttrs (!rustEnvironment.isNightly) {
+        # HACK
+        RUSTC_BOOTSTRAP = 1;
+      } // {
+
         dontInstall = true;
         dontFixup = true;
 
@@ -118,7 +123,7 @@ let
         buildPhase = ''
           cargo build -Z unstable-options --frozen --config ${cargoConfigFile} ${rustEnvironment.artifactDirFlag} $out/bin
         '';
-      };
+      });
 
   mkLoader =
     { systemXML

diff --git a/hacking/nix/scope/world/docs.nix b/hacking/nix/scope/world/docs.nix
@@ -130,7 +130,10 @@ let
         nativeBuildInputs = [ rsync rustToolchain ];
         RUST_TARGET_PATH = rustEnvironment.mkTargetPath targetTriple;
         LIBCLANG_PATH = libclangPath;
-      } // seL4RustEnvVars)  ''
+      } // lib.optionalAttrs (!rustEnvironment.isNightly) {
+        # HACK
+        RUSTC_BOOTSTRAP = 1;
+      } // seL4RustEnvVars) ''
         target_dir=$(pwd)/target
 
         cargo doc \