From e0244eb7a2290781ef490b6cedbd9c753caf6004 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Sun, 12 May 2019 22:56:57 +0200 Subject: [PATCH] build-self: Let HOME pass through the execution environment. This is a followup to 48d498c2c3984784336b27ba5e261319f3ac6a3a, which introduced a typo (missing '->' in 'mlet'.) Fixes . Reported by Karrick McDermott . * build-aux/build-self.scm (build): Add 'getenv' and 'setenv' calls for HOME. --- build-aux/build-self.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/build-aux/build-self.scm b/build-aux/build-self.scm index 1ddd2233b0..0a1234abb5 100644 --- a/build-aux/build-self.scm +++ b/build-aux/build-self.scm @@ -399,6 +399,7 @@ files." (mlet %store-monad ((build (build-program source version guile-version #:pull-version pull-version)) (system (if system (return system) (current-system))) + (home -> (getenv "HOME")) ;; Note: Use the deprecated names here because the ;; caller might be Guix <= 0.16.0. @@ -419,6 +420,9 @@ files." ;; $GUILE_LOAD_PATH & co. (with-clean-environment (setenv "GUILE_WARN_DEPRECATED" "no") ;be quiet and drive + (when home + ;; Inherit HOME so that 'xdg-directory' works. + (setenv "HOME" home)) (open-pipe* OPEN_READ (derivation->output-path build) source system version