From 4262ccfa89b616eebe496dc3ef2ee308b231c2de Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 27 Jul 2024 21:22:55 +0800
Subject: [PATCH] wrapper-manager: make modules and library set up-to-date

---
 lib/env-specific/wrapper-manager.nix                      | 2 +-
 modules/wrapper-manager/dconf.nix                         | 2 +-
 modules/wrapper-manager/programs/blender.nix              | 2 +-
 modules/wrapper-manager/programs/zellij.nix               | 2 +-
 modules/wrapper-manager/sandboxing/bubblewrap/default.nix | 8 ++++++--
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/lib/env-specific/wrapper-manager.nix b/lib/env-specific/wrapper-manager.nix
index 4075077e..3de3d49c 100644
--- a/lib/env-specific/wrapper-manager.nix
+++ b/lib/env-specific/wrapper-manager.nix
@@ -35,7 +35,7 @@ rec {
       }
 
       (lib.mkIf (builtins.length addons > 0) {
-        env.BLENDER_SYSTEM_RESOURCES = blenderAddons;
+        env.BLENDER_SYSTEM_RESOURCES.value = blenderAddons;
       })
 
       (lib.removeAttrs module [ "blenderPackage" "blenderArgs" "addons" ])
diff --git a/modules/wrapper-manager/dconf.nix b/modules/wrapper-manager/dconf.nix
index e6316a37..4fe7b0db 100644
--- a/modules/wrapper-manager/dconf.nix
+++ b/modules/wrapper-manager/dconf.nix
@@ -87,7 +87,7 @@ in
         };
 
         config = lib.mkIf submoduleCfg.enable {
-          env.DCONF_PROFILE = dconfProfileFile;
+          env.DCONF_PROFILE.value = dconfProfileFile;
         };
       };
     in
diff --git a/modules/wrapper-manager/programs/blender.nix b/modules/wrapper-manager/programs/blender.nix
index f457fd53..a05b80d5 100644
--- a/modules/wrapper-manager/programs/blender.nix
+++ b/modules/wrapper-manager/programs/blender.nix
@@ -57,7 +57,7 @@ in
     # TODO: Should we replace the .desktop file for this?
     wrappers.blender = {
       arg0 = lib.getExe' cfg.package "blender";
-      env.BLENDER_SYSTEM_RESOURCES = lib.mkIf (builtins.length cfg.addons > 0) addons;
+      env.BLENDER_SYSTEM_RESOURCES.value = lib.mkIf (builtins.length cfg.addons > 0) addons;
     };
   };
 }
diff --git a/modules/wrapper-manager/programs/zellij.nix b/modules/wrapper-manager/programs/zellij.nix
index d24ce9c6..b273f22e 100644
--- a/modules/wrapper-manager/programs/zellij.nix
+++ b/modules/wrapper-manager/programs/zellij.nix
@@ -26,7 +26,7 @@ in
     basePackages = [ cfg.package ];
     wrappers.zellij = {
       arg0 = lib.getExe' cfg.package "zellij";
-      env.ZELLIJ_CONFIG_FILE = cfg.configFile;
+      env.ZELLIJ_CONFIG_FILE.value = cfg.configFile;
     };
   };
 }
diff --git a/modules/wrapper-manager/sandboxing/bubblewrap/default.nix b/modules/wrapper-manager/sandboxing/bubblewrap/default.nix
index e1d0b7a9..359316e3 100644
--- a/modules/wrapper-manager/sandboxing/bubblewrap/default.nix
+++ b/modules/wrapper-manager/sandboxing/bubblewrap/default.nix
@@ -79,8 +79,12 @@ in
                   "--proc" "/proc"
                   "--dev" "/dev"
                 ]
-                ++ builtins.map (var: "--unsetenv ${var}") config.unset
-                ++ lib.mapAttrsToList (var: value: "--setenv ${var} ${value}") config.env;
+                ++ lib.mapAttrsToList
+                  (var: metadata:
+                    if metadata.action == "unset"
+                    then "--unsetenv ${var}"
+                    else "--setenv ${var} ${metadata.value}")
+                  config.env;
 
               arg0 = lib.getExe' submoduleCfg.package "bwrap";
               prependArgs = lib.mkBefore (submoduleCfg.extraArgs ++ [ "--" submoduleCfg.wraparound.executable ] ++ submoduleCfg.wraparound.extraArgs);