From 6abf3c8a971de1db003fcbf85baaafe7878609e9 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 18 Apr 2012 10:59:57 +0000 Subject: [PATCH] * Change $NIXPKGS_CONFIG to a better location (/etc/nix instead of /nix/etc). Not sure the default profile should be setting this at all though. svn path=/nixos/trunk/; revision=33824 --- modules/programs/bash/profile.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/programs/bash/profile.sh b/modules/programs/bash/profile.sh index 0b6f47d76dd..664cb8cf444 100644 --- a/modules/programs/bash/profile.sh +++ b/modules/programs/bash/profile.sh @@ -14,7 +14,7 @@ export __ETC_PROFILE_DONE=1 # Initialise a bunch of environment variables. export LOCALE_ARCHIVE=/var/run/current-system/sw/lib/locale/locale-archive export LD_LIBRARY_PATH=/var/run/opengl-driver/lib:/var/run/opengl-driver-32/lib # !!! only set if needed -export NIXPKGS_CONFIG=/nix/etc/config.nix +export NIXPKGS_CONFIG=/etc/nix/nixpkgs-config.nix export NIX_PATH=/nix/var/nix/profiles/per-user/root/channels/nixos:nixpkgs=/etc/nixos/nixpkgs:nixos=/etc/nixos/nixos:nixos-config=/etc/nixos/configuration.nix:services=/etc/nixos/services export PAGER="less -R" export EDITOR=nano