From 138fe481316803b200dd7747bc3814bf860bbd00 Mon Sep 17 00:00:00 2001
From: Erik Trickel <erik.trickel@asu.edu>
Date: Sun, 10 Nov 2024 17:41:33 -0700
Subject: [PATCH 1/2] Added an alternative location for external vscode
 extensions.

---
 workspace/services/code.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/workspace/services/code.nix b/workspace/services/code.nix
index 64d877a2..b6adc85e 100644
--- a/workspace/services/code.nix
+++ b/workspace/services/code.nix
@@ -44,13 +44,21 @@ let
 
     until [ -f /run/dojo/var/ready ]; do sleep 0.1; done
 
+    
+    if [ -d /run/challenge/share/code/extensions ]; then 
+      EXT_DIR="/run/challenge/share/code/extensions"
+    else
+      EXT_DIR="@out@/share/code-service/extensions"
+    fi 
+
     ${service}/bin/dojo-service start code-service/code-server \
       ${code-server}/bin/code-server \
         --auth=none \
         --bind-addr=0.0.0.0:8080 \
         --trusted-origins='*' \
         --disable-telemetry \
-        --extensions-dir=@out@/share/code-service/extensions
+        --extensions-dir=$EXT_DIR
+
 
     until ${pkgs.curl}/bin/curl -s localhost:8080 >/dev/null; do sleep 0.1; done
   '';

From de397b95a22b382c54a7c34d28586883cd9c95ed Mon Sep 17 00:00:00 2001
From: Connor Nelson <Connor@ConnorNelson.com>
Date: Mon, 11 Nov 2024 15:17:46 -0700
Subject: [PATCH 2/2] Update code.nix

---
 workspace/services/code.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/workspace/services/code.nix b/workspace/services/code.nix
index b6adc85e..78303cc4 100644
--- a/workspace/services/code.nix
+++ b/workspace/services/code.nix
@@ -46,9 +46,9 @@ let
 
     
     if [ -d /run/challenge/share/code/extensions ]; then 
-      EXT_DIR="/run/challenge/share/code/extensions"
+      EXTENSIONS_DIR="/run/challenge/share/code/extensions"
     else
-      EXT_DIR="@out@/share/code-service/extensions"
+      EXTENSIONS_DIR="@out@/share/code/extensions"
     fi 
 
     ${service}/bin/dojo-service start code-service/code-server \
@@ -57,7 +57,7 @@ let
         --bind-addr=0.0.0.0:8080 \
         --trusted-origins='*' \
         --disable-telemetry \
-        --extensions-dir=$EXT_DIR
+        --extensions-dir=$EXTENSIONS_DIR
 
 
     until ${pkgs.curl}/bin/curl -s localhost:8080 >/dev/null; do sleep 0.1; done
@@ -85,16 +85,16 @@ in pkgs.stdenv.mkDerivation {
     ln -s ${code-server}/bin/code-server $out/bin/code-server
     ln -s ${code-server}/bin/code-server $out/bin/code
 
-    mkdir -p $out/share/code-service/extensions
+    mkdir -p $out/share/code/extensions
     ${pkgs.wget}/bin/wget -P $NIX_BUILD_TOP 'https://github.com/microsoft/vscode-cpptools/releases/download/v1.20.5/cpptools-linux.vsix'
     export HOME=$NIX_BUILD_TOP
     ${code-server}/bin/code-server \
       --auth=none \
       --disable-telemetry \
-      --extensions-dir=$out/share/code-service/extensions \
+      --extensions-dir=$out/share/code/extensions \
       --install-extension ms-python.python \
       --install-extension $NIX_BUILD_TOP/cpptools-linux.vsix
-    chmod +x $out/share/code-service/extensions/ms-vscode.cpptools-*/{bin/cpptools*,bin/libc.so,debugAdapters/bin/OpenDebugAD7,LLVM/bin/clang-*}
+    chmod +x $out/share/code/extensions/ms-vscode.cpptools-*/{bin/cpptools*,bin/libc.so,debugAdapters/bin/OpenDebugAD7,LLVM/bin/clang-*}
 
     runHook postInstall
   '';