From 2ed5d333eef772d694c3bdd8725675f135eff2e0 Mon Sep 17 00:00:00 2001
From: Nick Spinale <nick@nickspinale.com>
Date: Fri, 7 Jun 2024 09:49:25 +0000
Subject: [PATCH] nix: Clean up microkit

Signed-off-by: Nick Spinale <nick@nickspinale.com>
---
 hacking/nix/scope/world/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/hacking/nix/scope/world/default.nix b/hacking/nix/scope/world/default.nix
index 35db1afbc..fd2051fc5 100644
--- a/hacking/nix/scope/world/default.nix
+++ b/hacking/nix/scope/world/default.nix
@@ -53,6 +53,12 @@ self: with self;
   microkitForUserspace = microkit;
   microkitForBoot = microkit;
 
+  microkitDir =
+    let
+      inherit (worldConfig.microkitConfig) board config;
+    in
+      "${microkitForUserspace.sdk}/board/${board}/${config}";
+
   seL4 = assert !worldConfig.isMicrokit; mkSeL4 worldConfig.kernelConfig;
 
   seL4ForUserspace = seL4;
@@ -64,21 +70,15 @@ self: with self;
   seL4IncludeDir =
     if worldConfig.isMicrokit
     then
-      let
-        d = "${microkitForUserspace.sdk}/board/qemu_virt_aarch64/debug";
-      in
-        "${d}/include"
+      "${microkitDir}/include"
     else
       "${seL4ForUserspace}/libsel4/include";
 
   seL4RustEnvVars =
     if worldConfig.isMicrokit
-    then
-      let
-        d = "${microkitForUserspace.sdk}/board/qemu_virt_aarch64/debug";
-      in {
-          SEL4_INCLUDE_DIRS = "${d}/include";
-      }
+    then {
+      SEL4_INCLUDE_DIRS = "${microkitDir}/include";
+    }
     else {
       SEL4_PREFIX = seL4ForUserspace;
     };