[bug#33111,1/3] install: Parameterize the profile name for 'populate-single-profile-directory'.

Message ID 20181021204943.2142-1-ludo@gnu.org
State Accepted
Headers show
Series Have the binary tarball populate ~root/.config/guix/current | expand


Context Check Description
cbaines/applying patch fail Apply failed

Commit Message

Ludovic Courtès Oct. 21, 2018, 8:49 p.m. UTC
* gnu/build/install.scm (populate-single-profile-directory): Add
 #:profile-name.  Replace hard-coded occurrences of "guix-profile" with
PROFILE-NAME.  Make the symlink part under /root a function of
 gnu/build/install.scm | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)


diff --git a/gnu/build/install.scm b/gnu/build/install.scm
index c602d6948..98c547f2e 100644
--- a/gnu/build/install.scm
+++ b/gnu/build/install.scm
@@ -160,6 +160,7 @@  deduplicates files common to CLOSURE and the rest of PREFIX."
 (define* (populate-single-profile-directory directory
                                             #:key profile closure
+                                            (profile-name "guix-profile")
                                             register? schema)
   "Populate DIRECTORY with a store containing PROFILE, whose closure is given
@@ -169,6 +170,9 @@  When REGISTER? is true, initialize DIRECTORY/var/guix/db to reflect the
 contents of the store; DEDUPLICATE? determines whether to deduplicate files in
 the store.
+PROFILE-NAME is the name of the profile being created under
+/var/guix/profiles, typically either \"guix-profile\" or \"current-guix\".
 This is used to create the self-contained tarballs with 'guix pack'."
   (define (scope file)
     (string-append directory "/" file))
@@ -198,12 +202,20 @@  This is used to create the self-contained tarballs with 'guix pack'."
   ;; Make root's profile, which makes it a GC root.
   (mkdir-p* %root-profile)
   (symlink* profile
-            (string-append %root-profile "/guix-profile-1-link"))
-  (symlink* "guix-profile-1-link"
-            (string-append %root-profile "/guix-profile"))
+            (string-append %root-profile "/" profile-name "-1-link"))
+  (symlink* (string-append profile-name "-1-link")
+            (string-append %root-profile "/" profile-name))
-  (mkdir-p* "/root")
-  (symlink* (string-append %root-profile "/guix-profile")
-            "/root/.guix-profile"))
+  (match profile-name
+    ("guix-profile"
+     (mkdir-p* "/root")
+     (symlink* (string-append %root-profile "/guix-profile")
+               "/root/.guix-profile"))
+    ("current-guix"
+     (mkdir-p* "/root/.config/guix")
+     (symlink* (string-append %root-profile "/current-guix")
+               "/root/.config/guix/current"))
+    (_
+     #t)))
 ;;; install.scm ends here