me/guix
Archived
1
0
Fork 0
Code Activity

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

Browse source 
Fixes <https://bugs.gnu.org/32183>.
Reported by Pjotr Prins <pjotr.public12@thebird.nl>
and Konrad Hinsen <konrad.hinsen@fastmail.net>.

* gnu/packages/package-management.scm (guix-daemon)[arguments]: Execute
/var/guix/profiles/per-user/root/current-guix/bin/guix instead of ~root/….
This commit is contained in:
Ludovic Courtès 2018-10-11 18:27:21 +02:00
parent 795d430d90
commit ed9d7cb4d9
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gnu/packages/package-management.scm
View file

@ -347,12 +347,14 @@ the Nix package manager.")
"install-nodist_pkglibexecSCRIPTS") "install-nodist_pkglibexecSCRIPTS")
;; We need to tell 'guix-daemon' which 'guix' command to use. ;; We need to tell 'guix-daemon' which 'guix' command to use.
;; Here we use a questionable hack where we hard-code ;; Here we use a questionable hack where we hard-code root's
;; "~root/.config", which could be wrong (XXX). ;; 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"))) (let ((out (assoc-ref outputs "out")))
(substitute* (find-files (string-append out "/libexec")) (substitute* (find-files (string-append out "/libexec"))
(("exec \".*/bin/guix\"") (("exec \".*/bin/guix\"")
"exec ~root/.config/guix/current/bin/guix")) "exec /var/guix/profiles/per-user/root/current-guix/bin/guix"))
#t))) #t)))
(delete 'wrap-program))))))) (delete 'wrap-program)))))))