04/04: gnu: guix-daemon: Run 'guix' from /var/guix/profiles/per-user/root.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit ed9d7cb4d95f8f4776e6fee2778ab52bc2852969
Author: Ludovic Courtès <address@hidden>
Date:   Thu Oct 11 18:27:21 2018 +0200

    gnu: guix-daemon: Run 'guix' from /var/guix/profiles/per-user/root.
    
    Fixes <https://bugs.gnu.org/32183>.
    Reported by Pjotr Prins <address@hidden>
    and Konrad Hinsen <address@hidden>.
    
    * gnu/packages/package-management.scm (guix-daemon)[arguments]: Execute
    /var/guix/profiles/per-user/root/current-guix/bin/guix instead of ~root/….
---
 gnu/packages/package-management.scm | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/package-management.scm 
b/gnu/packages/package-management.scm
index 500abd5..9a00232 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -347,12 +347,14 @@ the Nix package manager.")
                        "install-nodist_pkglibexecSCRIPTS")
 
                ;; We need to tell 'guix-daemon' which 'guix' command to use.
-               ;; Here we use a questionable hack where we hard-code
-               ;; "~root/.config", which could be wrong (XXX).
+               ;; Here we use a questionable hack where we hard-code root's
+               ;; current guix, which could be wrong (XXX).  Note that scripts
+               ;; like 'guix perform-download' do not run as root so we assume
+               ;; that they have access to /var/guix/profiles/per-user/root.
                (let ((out (assoc-ref outputs "out")))
                  (substitute* (find-files (string-append out "/libexec"))
                    (("exec \".*/bin/guix\"")
-                    "exec ~root/.config/guix/current/bin/guix"))
+                    "exec 
/var/guix/profiles/per-user/root/current-guix/bin/guix"))
                  #t)))
            (delete 'wrap-program)))))))