From 8f3e16540e4a7e0c9139d3428c6904e0ec731d6d Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Wed, 13 Nov 2024 10:56:17 +0800
Subject: [PATCH] tests/modules/wrapper-manager: update wraparound config

---
 .../wrapper-manager/sandboxing/boxxy/basic.nix     | 14 +++++++-------
 .../bubblewrap/basic-app-with-dbus-filter.nix      |  8 ++++----
 .../sandboxing/bubblewrap/basic-zellij.nix         |  4 ++--
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix b/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix
index 4b6a2181..35c45e43 100644
--- a/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix
+++ b/tests/modules/wrapper-manager/sandboxing/boxxy/basic.nix
@@ -1,21 +1,21 @@
 { config, lib, pkgs, ... }:
 
 {
-  build.isBinary = false;
+  build.variant = "shell";
   locale.enable = true;
 
   wrappers.tmux = {
-    sandboxing.variant = "boxxy";
-    sandboxing.wraparound.arg0 = lib.getExe' pkgs.tmux "tmux";
-    sandboxing.boxxy.rules = {
+    wraparound.variant = "boxxy";
+    wraparound.subwrapper.arg0 = lib.getExe' pkgs.tmux "tmux";
+    wraparound.boxxy.rules = {
       "~/.config/tmux/tmux.conf".source = "~/.tmux.conf";
     };
   };
 
   wrappers.zellij = {
-    sandboxing.variant = "boxxy";
-    sandboxing.wraparound.arg0 = lib.getExe' pkgs.zellij "zellij";
-    sandboxing.boxxy.rules = {
+    wraparound.variant = "boxxy";
+    wraparound.subwrapper.arg0 = lib.getExe' pkgs.zellij "zellij";
+    wraparound.boxxy.rules = {
       "$XDG_CONFIG_HOME/zellij/hello.kdl".source = "$XDG_CONFIG_HOME/zellij/config.kdl";
     };
   };
diff --git a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix
index de24c2df..337ad9fa 100644
--- a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix
+++ b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-app-with-dbus-filter.nix
@@ -2,11 +2,11 @@
 { config, lib, pkgs, ... }:
 
 {
-  build.isBinary = false;
+  build.variant = "shell";
   wrappers.hello = {
-    sandboxing.variant = "bubblewrap";
-    sandboxing.wraparound.arg0 = lib.getExe' pkgs.hello "hello";
-    sandboxing.bubblewrap.dbus = {
+    wraparound.variant = "bubblewrap";
+    wraparound.subwrapper.arg0 = lib.getExe' pkgs.hello "hello";
+    wraparound.bubblewrap.dbus = {
       enable = true;
       filter.addresses = {
         "org.freedesktop.systemd1".policies.level = "talk";
diff --git a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix
index c952f98b..7e57c96b 100644
--- a/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix
+++ b/tests/modules/wrapper-manager/sandboxing/bubblewrap/basic-zellij.nix
@@ -3,8 +3,8 @@
 {
   locale.enable = true;
   wrappers.zellij = {
-    sandboxing.variant = "bubblewrap";
-    sandboxing.wraparound.arg0 = lib.getExe' pkgs.zellij "zellij";
+    wraparound.variant = "bubblewrap";
+    wraparound.subwrapper.arg0 = lib.getExe' pkgs.zellij "zellij";
   };
   build.extraPassthru.tests = {
     zellijWrapperCheck =