diff options
| author | Robert Helgesson <robert@rycee.net> | 2020-05-24 18:08:49 +0200 |
|---|---|---|
| committer | Robert Helgesson <robert@rycee.net> | 2020-05-26 00:28:59 +0200 |
| commit | b95ad632010bf1d135f7585c590f51f6c3dc2896 (patch) | |
| tree | c7f7090407e18759912e7f4372976bc31d96151d /modules/misc | |
| parent | 2ed978eb79af72a7696ea61df07102d38134517f (diff) | |
Deprecate use of `builtins.getEnv`
This removes the use of the non-deterministic function
`builtins.getEnv` for state version ≥ 20.09.
PR #1269
Diffstat (limited to 'modules/misc')
| -rw-r--r-- | modules/misc/xdg.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/modules/misc/xdg.nix b/modules/misc/xdg.nix index 84ab4ada59a..7420e8e92b3 100644 --- a/modules/misc/xdg.nix +++ b/modules/misc/xdg.nix @@ -85,12 +85,20 @@ in }; }) - (mkIf (!cfg.enable) { + # Legacy non-deterministic setup. + (mkIf (!cfg.enable && versionOlder config.home.stateVersion "20.09") { xdg.cacheHome = getXdgDir "XDG_CACHE_HOME" defaultCacheHome; xdg.configHome = getXdgDir "XDG_CONFIG_HOME" defaultConfigHome; xdg.dataHome = getXdgDir "XDG_DATA_HOME" defaultDataHome; }) + # "Modern" deterministic setup. + (mkIf (!cfg.enable && versionAtLeast config.home.stateVersion "20.09") { + xdg.cacheHome = mkDefault defaultCacheHome; + xdg.configHome = mkDefault defaultConfigHome; + xdg.dataHome = mkDefault defaultDataHome; + }) + { home.file = mkMerge [ cfg.configFile |