From 27d2857a9927aa197b9679b9a2dcf59b97c06907 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Wed, 9 Oct 2019 20:40:33 +0200
Subject: [PATCH] nix-daemon.nix: Use 'nix ping-store' to initialize
 directories

---
 nixos/modules/services/misc/nix-daemon.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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