From 6d285cc747a9c660ad20a25a07263b5eece4bd7d Mon Sep 17 00:00:00 2001
From: ptaylor <paul.e.taylor@me.com>
Date: Wed, 18 Feb 2026 23:11:40 -0800
Subject: [PATCH] fix nvhpc module loading on <=ubuntu22.04

---
 features/src/nvhpc/devcontainer-feature.json | 2 +-
 features/src/nvhpc/load-nvhpc.sh             | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/features/src/nvhpc/devcontainer-feature.json b/features/src/nvhpc/devcontainer-feature.json
index 97ed553d..ef4b4aaa 100644
--- a/features/src/nvhpc/devcontainer-feature.json
+++ b/features/src/nvhpc/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVHPC SDK",
   "id": "nvhpc",
-  "version": "26.4.3",
+  "version": "26.4.4",
   "description": "A feature to install the NVHPC SDK",
   "options": {
     "version": {
diff --git a/features/src/nvhpc/load-nvhpc.sh b/features/src/nvhpc/load-nvhpc.sh
index bd2bccd2..eb7361ea 100755
--- a/features/src/nvhpc/load-nvhpc.sh
+++ b/features/src/nvhpc/load-nvhpc.sh
@@ -23,6 +23,11 @@ if ! test "${DEVCONTAINERS_NVHPC_LOADED_BY:-}" = "$(whoami)"; then
     done
     unset NVHPC_MODULEFILES_DIR;
 
+    if ! test -n "${MODULEPATH:+x}"; then
+        MODULEPATH="$(IFS=:; echo "${NVHPC_MODULEFILE_DIRS[*]}")";
+        export MODULEPATH;
+    fi
+
     # Load the NHVPC modules again
     for NVHPC_MODULE_NAME in "nvhpc-hpcx-cuda${NVHPC_CUDA_VERSION_MAJOR}/${NVHPC_VERSION}" \
                              "nvhpc-hpcx/${NVHPC_VERSION}"; do