diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 12:03:19 +0200 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-08-05 14:33:15 +0200 |
| commit | 3f1354a3cd61d37d9b5c91706945f849c9af71c4 (patch) | |
| tree | dbf88ad164f1896ee11088c0476993cf8877ec9c /nixos/modules | |
| parent | 525c901ce941552ef125ac7f61cd095fcf7e1358 (diff) | |
| download | nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar.gz nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar.bz2 nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar.lz nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar.xz nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.tar.zst nixlib-3f1354a3cd61d37d9b5c91706945f849c9af71c4.zip | |
Add an option ‘nix.nixPath’ for specifying $NIX_PATH
Diffstat (limited to 'nixos/modules')
| -rw-r--r-- | nixos/modules/programs/environment.nix | 9 | ||||
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 19 |
2 files changed, 18 insertions, 10 deletions
diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index dce757ceb623..52f6cc221119 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -23,15 +23,6 @@ in EDITOR = mkDefault "nano"; }; - environment.sessionVariables = - { NIX_PATH = - [ "/nix/var/nix/profiles/per-user/root/channels/nixos" - "nixpkgs=/etc/nixos/nixpkgs" - "nixos-config=/etc/nixos/configuration.nix" - "/nix/var/nix/profiles/per-user/root/channels" - ]; - }; - environment.profiles = [ "$HOME/.nix-profile" "/nix/var/nix/profiles/default" diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index 4088f9ff055d..7c42076280c2 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -309,6 +309,21 @@ in ''; }; + nixPath = mkOption { + type = types.listOf types.str; + default = + [ "/nix/var/nix/profiles/per-user/root/channels/nixos" + "nixpkgs=/etc/nixos/nixpkgs" + "nixos-config=/etc/nixos/configuration.nix" + "/nix/var/nix/profiles/per-user/root/channels" + ]; + description = '' + The default Nix expression search path, used by the Nix + evaluator to look up paths enclosed in angle brackets + (e.g. <literal><nixpkgs></literal>). + ''; + }; + }; }; @@ -378,7 +393,9 @@ in }; # Set up the environment variables for running Nix. - environment.sessionVariables = cfg.envVars; + environment.sessionVariables = cfg.envVars // + { NIX_PATH = concatStringsSep ":" cfg.nixPath; + }; environment.extraInit = '' |