summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gnu/packages/package-management.scm8
1 files changed, 5 insertions, 3 deletions
diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm
index 500abd51251..9a0023233f2 100644
--- a/gnu/packages/package-management.scm
+++ b/gnu/packages/package-management.scm
@@ -347,12 +347,14 @@ the Nix package manager.")
347 "install-nodist_pkglibexecSCRIPTS") 347 "install-nodist_pkglibexecSCRIPTS")
348 348
349 ;; We need to tell 'guix-daemon' which 'guix' command to use. 349 ;; We need to tell 'guix-daemon' which 'guix' command to use.
350 ;; Here we use a questionable hack where we hard-code 350 ;; Here we use a questionable hack where we hard-code root's
351 ;; "~root/.config", which could be wrong (XXX). 351 ;; current guix, which could be wrong (XXX). Note that scripts
352 ;; like 'guix perform-download' do not run as root so we assume
353 ;; that they have access to /var/guix/profiles/per-user/root.
352 (let ((out (assoc-ref outputs "out"))) 354 (let ((out (assoc-ref outputs "out")))
353 (substitute* (find-files (string-append out "/libexec")) 355 (substitute* (find-files (string-append out "/libexec"))
354 (("exec \".*/bin/guix\"") 356 (("exec \".*/bin/guix\"")
355 "exec ~root/.config/guix/current/bin/guix")) 357 "exec /var/guix/profiles/per-user/root/current-guix/bin/guix"))
356 #t))) 358 #t)))
357 (delete 'wrap-program))))))) 359 (delete 'wrap-program)))))))
358 360