diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2020-05-07 12:38:12 +0200 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2020-05-07 12:39:22 +0200 |
| commit | 9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a (patch) | |
| tree | bcaf4a81cbdb5ccbce5cfcc726c46f8fc1f8acae /nixos/modules/services/misc | |
| parent | 4acf1e66506e05f41c4a4d0a86e999b30f35bdf3 (diff) | |
| download | nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar.gz nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar.bz2 nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar.lz nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar.xz nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.tar.zst nixlib-9bf75a27f46f6b330b02ce25ac34d4d2ede3ba4a.zip | |
Revert "nix-daemon.nix: Use 'nix ping-store' to initialize directories"
This reverts commits 9d0de0dc57ce97ab9cc3d73a66e914d718e4af3b, 27d2857a9927aa197b9679b9a2dcf59b97c06907. 'nix ping-store' is an experimental command so it doesn't work in Nix 2.4 unless you set 'experimental-features = nix-command' in nix.conf.
Diffstat (limited to 'nixos/modules/services/misc')
| -rw-r--r-- | nixos/modules/services/misc/nix-daemon.nix | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index b28e3679d1c7..2577cb78e96e 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -510,8 +510,7 @@ in system.activationScripts.nix = stringAfter [ "etc" "users" ] '' - # Create directories in /nix. - ${nix}/bin/nix ping-store --no-net + install -m 0755 -d /nix/var/nix/{gcroots,profiles}/per-user # Subscribe the root user to the NixOS channel by default. if [ ! -e "/root/.nix-channels" ]; then |