apprt: require envmap for exec-based termio (#5742)v1.1.1

Supercedes #5726

3 files changed, 4 insertions, 5 deletions

diff --git a/src/apprt/embedded.zig b/src/apprt/embedded.zig
index 4b9066355..ffcf7fdbe 100644
--- a/src/apprt/embedded.zig
+++ b/src/apprt/embedded.zig
@@ -1030,7 +1030,7 @@ pub const Surface = struct {
         };
     }
 
-    pub fn defaultTermioEnv(self: *const Surface) !?std.process.EnvMap {
+    pub fn defaultTermioEnv(self: *const Surface) !std.process.EnvMap {
         const alloc = self.app.core_app.alloc;
         var env = try internal_os.getEnvMap(alloc);
         errdefer env.deinit();
diff --git a/src/apprt/glfw.zig b/src/apprt/glfw.zig
index cb034cd86..39c6e058c 100644
--- a/src/apprt/glfw.zig
+++ b/src/apprt/glfw.zig
@@ -880,9 +880,8 @@ pub const Surface = struct {
         };
     }
 
-    pub fn defaultTermioEnv(self: *Surface) !?std.process.EnvMap {
-        _ = self;
-        return null;
+    pub fn defaultTermioEnv(self: *Surface) !std.process.EnvMap {
+        return try internal_os.getEnvMap(self.app.app.alloc);
     }
 
     fn sizeCallback(window: glfw.Window, width: i32, height: i32) void {
diff --git a/src/apprt/gtk/Surface.zig b/src/apprt/gtk/Surface.zig
index c4b7717cc..6c39677d5 100644
--- a/src/apprt/gtk/Surface.zig
+++ b/src/apprt/gtk/Surface.zig
@@ -2254,7 +2254,7 @@ fn doPaste(self: *Surface, data: [:0]const u8) void {
     };
 }
 
-pub fn defaultTermioEnv(self: *Surface) !?std.process.EnvMap {
+pub fn defaultTermioEnv(self: *Surface) !std.process.EnvMap {
     const alloc = self.app.core_app.alloc;
     var env = try internal_os.getEnvMap(alloc);
     errdefer env.deinit();