branch master updated: services: nix: Fix activation.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

wigust pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new bc06affabc services: nix: Fix activation.
bc06affabc is described below

commit bc06affabcf68bbe93e9afee13bef8cc8c6336a2
Author: Oleg Pykhalov <go.wigust@gmail.com>
AuthorDate: Sun Jun 2 11:01:57 2024 +0300

    services: nix: Fix activation.
    
    This commit follows 797be0ea5c3703ad96acd32c98dca5f946cf5c95.
    
    Reported by kiasoc5 <kiasoc5@disroot.org> at
    <https://lists.gnu.org/archive/html/help-guix/2024-05/msg00185.html>.
    
    * gnu/services/nix.scm (nix-activation): Avoid provisioning the store if it
    already exists.
    
    Change-Id: I159e8af5d7bd6ce62857b356d6e9ac68fe16acf4
---
 gnu/services/nix.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/services/nix.scm b/gnu/services/nix.scm
index 419e5968fe..9749fc9e0f 100644
--- a/gnu/services/nix.scm
+++ b/gnu/services/nix.scm
@@ -98,12 +98,14 @@ GID."
   #~(begin
       (use-modules (guix build utils)
                    (srfi srfi-26))
-      (for-each (cut mkdir-p <>) '("/nix/store" "/nix/var/log"
+      (for-each (cut mkdir-p <>) '("/nix/var/log"
                                    "/nix/var/nix/gcroots/per-user"
                                    "/nix/var/nix/profiles/per-user"))
-      (chown "/nix/store"
-             (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01")))
-      (chmod "/nix/store" #o775)
+      (unless (file-exists? #$%nix-store-directory)
+        (mkdir-p #$%nix-store-directory)
+        (chown #$%nix-store-directory
+               (passwd:uid (getpw "root")) (group:gid (getpw "nixbld01")))
+        (chmod #$%nix-store-directory #o775))
       (for-each (cut chmod <> #o777) '("/nix/var/nix/profiles"
                                        "/nix/var/nix/profiles/per-user"))))