summary refs log tree commit diff
diff options
context:
space:
mode:
authorEelco Dolstra <edolstra@gmail.com>2019-10-09 20:40:33 +0200
committerEelco Dolstra <edolstra@gmail.com>2019-10-10 16:24:33 +0200
commit27d2857a9927aa197b9679b9a2dcf59b97c06907 (patch)
treea312e8e03dbedcb301ea981fca494c7109c4bd21
parent2c97f0669dd6daa66e4c9a9d91931f272413be8b (diff)
downloadnixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar.gz
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar.bz2
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar.lz
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar.xz
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.tar.zst
nixpkgs-27d2857a9927aa197b9679b9a2dcf59b97c06907.zip
nix-daemon.nix: Use 'nix ping-store' to initialize directories
-rw-r--r--nixos/modules/services/misc/nix-daemon.nix3
1 files changed, 2 insertions, 1 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix
index f78dd532eb8..92065fb7fa2 100644
--- a/nixos/modules/services/misc/nix-daemon.nix
+++ b/nixos/modules/services/misc/nix-daemon.nix
@@ -445,7 +445,8 @@ in
 
     system.activationScripts.nix = stringAfter [ "etc" "users" ]
       ''
-        install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user
+        # Create directories in /nix.
+        ${nix}/bin/nix ping-store
 
         # Subscribe the root user to the NixOS channel by default.
         if [ ! -e "/root/.nix-channels" ]; then