about summary refs log tree commit diff
path: root/modules/profiles
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-06-15 14:19:05 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-06-15 14:19:05 +0200
commitaa5a91cb998359d2bdb316135a8d1b0494f9aa92 (patch)
treed8a4780e7d81d0c23622efce1ec7147a5d859010 /modules/profiles
parentd2ff1a90527671143bdca3218cfb37d0b15a6da8 (diff)
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 <nixpkgs/nixos/lib/eval-config.nix> {
    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 <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/profiles')
-rw-r--r--modules/profiles/common.nix6
1 files changed, 3 insertions, 3 deletions
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
       ];
-    });
+    };
   };
 }