public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* For consistency, use /etc/nix/nix.conf instead of /nix/etc/nix/nix.conf.

Browse Source 
There is really no reason to have a configuration file outside of /etc,
  and it's consistent with what the Fedora/Debian packages for Nix use.

svn path=/nixos/trunk/; revision=30212
This commit is contained in:
Eelco Dolstra 2011-11-03 19:04:54 +00:00
parent efc64042e0
commit d77fc84d2f
3 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/services/misc/nix-daemon.nix
View File

@ -226,7 +226,7 @@ in
$extraOptions $extraOptions
END END
''; '';
target = "nix.conf"; # will be symlinked from /nix/etc/nix/nix.conf in activate-configuration.sh. target = "nix/nix.conf";
} }
] ]
@ -281,7 +281,7 @@ in
nix.envVars = nix.envVars =
'' ''
export NIX_CONF_DIR=/nix/etc/nix export NIX_CONF_DIR=/etc/nix
# Enable the copy-from-other-stores substituter, which allows builds # Enable the copy-from-other-stores substituter, which allows builds
# to be sped up by copying build results from remote Nix stores. To # to be sped up by copying build results from remote Nix stores. To
@ -306,8 +306,6 @@ in
system.activationScripts.nix = stringAfter [ "etc" "users" ] system.activationScripts.nix = stringAfter [ "etc" "users" ]
'' ''
# Set up Nix. # Set up Nix.
mkdir -p /nix/etc/nix
ln -sfn /etc/nix.conf /nix/etc/nix/nix.conf
chown root.nixbld /nix/store chown root.nixbld /nix/store
chmod 1775 /nix/store chmod 1775 /nix/store

2
modules/services/scheduling/cron.nix
View File

@ -12,7 +12,7 @@ let
SHELL=${pkgs.bash}/bin/bash SHELL=${pkgs.bash}/bin/bash
PATH=${config.system.path}/bin:${config.system.path}/sbin PATH=${config.system.path}/bin:${config.system.path}/sbin
MAILTO="${config.services.cron.mailto}" MAILTO="${config.services.cron.mailto}"
NIX_CONF_DIR=/nix/etc/nix NIX_CONF_DIR=/etc/nix
${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
''; '';

2
modules/services/scheduling/fcron.nix
View File

@ -13,7 +13,7 @@ let
SHELL=${pkgs.bash}/bin/bash SHELL=${pkgs.bash}/bin/bash
PATH=${config.system.path}/bin:${config.system.path}/sbin PATH=${config.system.path}/bin:${config.system.path}/sbin
MAILTO="${config.services.cron.mailto}" MAILTO="${config.services.cron.mailto}"
NIX_CONF_DIR=/nix/etc/nix NIX_CONF_DIR=/etc/nix
${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)} ${pkgs.lib.concatStrings (map (job: job + "\n") config.services.cron.systemCronJobs)}
''; '';