guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

01/09: website: Fix building with GUIX_WEB_SITE_ROOT_PATH.


From: Ludovic Courtès
Subject: 01/09: website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
Date: Sun, 26 Jul 2020 13:16:32 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix-artwork.

commit 58e9e296493bbcbd71dee15e67a8c4a374cdd9f7
Author: Florian Pelz <pelzflorian@pelzflorian.de>
AuthorDate: Wed Oct 30 22:45:45 2019 +0100

    website: Fix building with GUIX_WEB_SITE_ROOT_PATH.
    
    * website/.guix.scm: Retain GUIX_WEB_SITE_ROOT_PATH in the build expression.
---
 website/.guix.scm | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/website/.guix.scm b/website/.guix.scm
index 060172f..fcd2570 100644
--- a/website/.guix.scm
+++ b/website/.guix.scm
@@ -38,6 +38,9 @@
               #:recursive? #t
               #:select? (git-predicate this-directory)))
 
+(define root-path
+  (getenv "GUIX_WEB_SITE_ROOT_PATH"))
+
 (define (package+propagated-inputs package)
   (match (package-transitive-propagated-inputs package)
     (((labels packages) ...)
@@ -126,6 +129,10 @@
           ;; Use a sane default.
           (setenv "XDG_CACHE_HOME" "/tmp/.cache")
 
+          ;; Use GUIX_WEB_SITE_ROOT_PATH from the environment in which
+          ;; this script was run.
+          (setenv "GUIX_WEB_SITE_ROOT_PATH" #$root-path)
+
           (format #t "Running 'haunt build'...~%")
           (invoke #+(file-append haunt-with-latest-guile "/bin/haunt")
                   "build")



reply via email to

[Prev in Thread] Current Thread [Next in Thread]