From 4120a54385f9d18f6a639d1358e1b56fd0250247 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 2 Jul 2024 11:56:26 +0800 Subject: [PATCH] wrapper-manager-fds/modules: add unset option --- modules/wrapper-manager/base.nix | 9 +++++++++ modules/wrapper-manager/build.nix | 1 + 2 files changed, 10 insertions(+) diff --git a/modules/wrapper-manager/base.nix b/modules/wrapper-manager/base.nix index 7b01afa..ea0c5ea 100644 --- a/modules/wrapper-manager/base.nix +++ b/modules/wrapper-manager/base.nix @@ -64,6 +64,15 @@ in }; }; + unset = lib.mkOption { + type = with lib.types; listOf nonEmptyStr; + description = '' + A list of environment variables to be unset into the wrapper script. + ''; + default = [ ]; + example = [ "NO_COLOR" ]; + }; + executableName = lib.mkOption { type = lib.types.nonEmptyStr; description = '' diff --git a/modules/wrapper-manager/build.nix b/modules/wrapper-manager/build.nix index b44582b..7924d75 100644 --- a/modules/wrapper-manager/build.nix +++ b/modules/wrapper-manager/build.nix @@ -63,6 +63,7 @@ "--argv0" (config.executableName or config.arg0) ] ++ (lib.mapAttrsToList (n: v: "--set ${n} ${v}") config.env) + ++ (builtins.map (v: "--unset ${v}") config.unset) ++ (builtins.map (v: "--prefix 'PATH' ':' ${lib.escapeShellArg v}") config.pathAdd) ++ (builtins.map (v: "--add-flags ${v}") config.prependArgs) ++ (builtins.map (v: "--append-flags ${v}") config.appendArgs)