about summary refs log tree commit diff
diff options
context:
space:
mode:
authorArun Isaac2024-03-11 15:12:27 +0000
committerArun Isaac2024-03-11 15:12:27 +0000
commit717af5c261c3614ff45eb6b9d7bfcf73adcb09e2 (patch)
treee75823524823b5c5e57b0b789eab3fba30ef5d46
parent3287d39906ce5018f6a3b264bf2657986eaded49 (diff)
downloadgn-machines-717af5c261c3614ff45eb6b9d7bfcf73adcb09e2.tar.gz
Infer profile from guix executable used to build container.
Not everyone has GUIX_PROFILE set in their environment. Inferring the
profile from the guix executable is more reliable.

* genenetwork-development.scm (channels-scm-gexp): Infer profile from
guix executable used to build container.
-rw-r--r--genenetwork-development.scm7
1 files changed, 5 insertions, 2 deletions
diff --git a/genenetwork-development.scm b/genenetwork-development.scm
index 7c34719..886ad82 100644
--- a/genenetwork-development.scm
+++ b/genenetwork-development.scm
@@ -993,8 +993,11 @@ should be included in the channels.scm file."
                                                   published-channel-names)
                                             (channel->code channel)))
                                      (profile-channels
-                                      (or (getenv "GUIX_PROFILE")
-                                          (string-append %profile-directory "/current-guix")))))
+                                      ;; Infer profile from guix
+                                      ;; executable used.
+                                      (match (program-arguments)
+                                        ((program . _)
+                                         (dirname (dirname program)))))))
              port))))))
 
 (define (development-server-reverse-proxy-server-block gn2-port gn3-port)