guix-commits
[Top][All Lists]
Advanced

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

03/03: gnu: man-db: Fix cross-compilation.


From: guix-commits
Subject: 03/03: gnu: man-db: Fix cross-compilation.
Date: Fri, 7 Jan 2022 22:02:16 -0500 (EST)

nckx pushed a commit to branch master
in repository guix.

commit 8521adf935919d1dc07078751f77003405cf79cb
Author: Tobias Geerinckx-Rice <me@tobias.gr>
AuthorDate: Sat Jan 8 03:50:11 2022 +0100

    gnu: man-db: Fix cross-compilation.
    
    * gnu/packages/linux.scm (man-db)[arguments]:
    Avoid %OUTPUT when cross-compiling.
---
 gnu/packages/man.scm | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/man.scm b/gnu/packages/man.scm
index d9e8b07471..c6d8b8881d 100644
--- a/gnu/packages/man.scm
+++ b/gnu/packages/man.scm
@@ -183,10 +183,17 @@ a flexible and convenient way.")
                         (string-append "--with-xz=" xz "/bin/xz")
                         (string-append "--with-col=" util "/bin/col")
                         ;; The default systemd directories ignore --prefix.
+                        ;; XXX TODO: Replace with simply #$OUTPUT on staging.
                         (string-append "--with-systemdsystemunitdir="
-                                       %output "/lib/systemd/system")
+                                       #$(if (%current-target-system)
+                                             #~#$output
+                                             #~%output)
+                                       "/lib/systemd/system")
                         (string-append "--with-systemdtmpfilesdir="
-                                       %output "/lib/tmpfiles.d"))
+                                       #$(if (%current-target-system)
+                                             #~#$output
+                                             #~%output)
+                                       "/lib/tmpfiles.d"))
                    (map (lambda (prog)
                           (string-append "--with-" prog "=" groff-minimal
                                          "/bin/" prog))



reply via email to

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