From aa5a91cb998359d2bdb316135a8d1b0494f9aa92 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 15 Jun 2015 14:19:05 +0200 Subject: profiles/common: Fix override of sessionVariables. Ugh... I must have been quite distracted while writing this. Of course, doing a mkOverride on environment.sessionVariables instead of environment.sessionVariables.NIX_PATH is going to clear *all* sessionVariables instead of just replacing NIX_PATH. This time however, I did a short test with: nix-instantiate --eval --strict -E ' (import { modules = [ ./modules/profiles/common.nix ]; }).config.environment.sessionVariables ' ... to make sure I just didn't break it *again*. Also, I'm going to immediately test this after the next evaluation, as my current system is lacking quite a lot of necessary sessionVariables. Signed-off-by: aszlig --- modules/profiles/common.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'modules/profiles/common.nix') diff --git a/modules/profiles/common.nix b/modules/profiles/common.nix index c9f67e7d..ede7cdf9 100644 --- a/modules/profiles/common.nix +++ b/modules/profiles/common.nix @@ -36,13 +36,13 @@ with lib; environment.sessionVariables = let rootChannelsPath = "/nix/var/nix/profiles/per-user/root/channels"; channelPath = "${rootChannelsPath}/${config.vuizvui.channelName}"; - in mkIf config.vuizvui.modifyNixPath (mkOverride 90 { - NIX_PATH = [ + in mkIf config.vuizvui.modifyNixPath { + NIX_PATH = mkOverride 90 [ "vuizvui=${channelPath}" "nixpkgs=${channelPath}/nixpkgs" "nixos-config=/etc/nixos/configuration.nix" rootChannelsPath ]; - }); + }; }; } -- cgit 1.4.1