guix-commits
[Top][All Lists]
Advanced

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

02/02: gnu: polkit-duktape: Fix cross-compiling.


From: guix-commits
Subject: 02/02: gnu: polkit-duktape: Fix cross-compiling.
Date: Tue, 6 Sep 2022 11:47:24 -0400 (EDT)

efraim pushed a commit to branch master
in repository guix.

commit 67e5b56960dc2d53774509751215e35e86d2b28f
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Tue Sep 6 16:29:32 2022 +0300

    gnu: polkit-duktape: Fix cross-compiling.
    
    * gnu/packages/polkit.scm (polkit-duktape)[arguments]: When
    cross-compiling also search native-inputs for inputs.
---
 gnu/packages/polkit.scm | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm
index a75608cd43..56e2589da3 100644
--- a/gnu/packages/polkit.scm
+++ b/gnu/packages/polkit.scm
@@ -118,14 +118,25 @@
                  (string-append out "/share/gir-1.0/"))
                 (("@INTROSPECTION_TYPELIBDIR@")
                  (string-append out "/lib/girepository-1.0/"))))))
-         (add-after 'unpack 'fix-manpage-generation
-           (lambda* (#:key inputs #:allow-other-keys)
-             (let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl")
-                                          "/xml/xsl/docbook-xsl-"
-                                          ,(package-version docbook-xsl))))
-               (substitute* '("docs/man/Makefile.am" "docs/man/Makefile.in")
-                 (("http://docbook.sourceforge.net/release/xsl/current";)
-                  xsldoc)))))
+         ;; TODO: Core-updates: Unify on the cross-build version.
+         ,@(if (%current-target-system)
+             `((add-after 'unpack 'fix-manpage-generation
+               (lambda* (#:key inputs native-inputs #:allow-other-keys)
+                 (let ((xsldoc (string-append (assoc-ref (or native-inputs 
inputs)
+                                                         "docbook-xsl")
+                                              "/xml/xsl/docbook-xsl-"
+                                              ,(package-version docbook-xsl))))
+                   (substitute* '("docs/man/Makefile.am" 
"docs/man/Makefile.in")
+                     (("http://docbook.sourceforge.net/release/xsl/current";)
+                      xsldoc))))))
+             `((add-after 'unpack 'fix-manpage-generation
+               (lambda* (#:key inputs #:allow-other-keys)
+                 (let ((xsldoc (string-append (assoc-ref inputs "docbook-xsl")
+                                              "/xml/xsl/docbook-xsl-"
+                                              ,(package-version docbook-xsl))))
+                   (substitute* '("docs/man/Makefile.am" 
"docs/man/Makefile.in")
+                     (("http://docbook.sourceforge.net/release/xsl/current";)
+                      xsldoc)))))))
          (replace
           'install
           (lambda* (#:key outputs (make-flags '()) #:allow-other-keys)



reply via email to

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