diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-28 12:56:56 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2009-05-28 12:56:56 +0000 |
| commit | de7aae5d5e54fec70a40742c2b11857bdeb3f944 (patch) | |
| tree | 42c735bbaa03fbca0b235380b4b4b6d7e5692142 /modules/programs | |
| parent | e4716ce3ef5c2c8bcbeecdb37098cb24000369bd (diff) | |
| download | nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar.gz nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar.bz2 nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar.lz nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar.xz nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.tar.zst nixpkgs-de7aae5d5e54fec70a40742c2b11857bdeb3f944.zip | |
* Move the generation of /etc/nix.machines to the nix-daemon module.
svn path=/nixos/branches/modular-nixos/; revision=15765
Diffstat (limited to 'modules/programs')
| -rw-r--r-- | modules/programs/bash/bash.nix | 1 | ||||
| -rw-r--r-- | modules/programs/bash/bashrc.sh | 15 |
2 files changed, 1 insertions, 15 deletions
diff --git a/modules/programs/bash/bash.nix b/modules/programs/bash/bash.nix index e7be3b5e102..d992d0888ba 100644 --- a/modules/programs/bash/bash.nix +++ b/modules/programs/bash/bash.nix @@ -15,7 +15,6 @@ wrapperDir = config.security.wrapperDir; modulesTree = config.system.modulesTree; defaultLocale = config.i18n.defaultLocale; - nixEnvVars = config.nix.envVars; shellInit = config.environment.shellInit; }; target = "bashrc"; diff --git a/modules/programs/bash/bashrc.sh b/modules/programs/bash/bashrc.sh index ad6e5d3f247..d18cb010b50 100644 --- a/modules/programs/bash/bashrc.sh +++ b/modules/programs/bash/bashrc.sh @@ -9,21 +9,8 @@ export LANG=@defaultLocale@ export EDITOR=nano export INFOPATH=/var/run/current-system/sw/info:/var/run/current-system/sw/share/info export LOCATE_PATH=/var/cache/locatedb -@shellInit@ export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive - - -# Set up secure multi-user builds: non-root users build through the -# Nix daemon. -if test "$USER" != root; then - export NIX_REMOTE=daemon -else - export NIX_REMOTE= -fi - - -# Set up the environment variables for running Nix. -@nixEnvVars@ +@shellInit@ # Include the various profiles in the appropriate environment variables. |