guix-commits
[Top][All Lists]
Advanced

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

branch master updated: gnu: lbzip2: Fix cross-compilation.


From: guix-commits
Subject: branch master updated: gnu: lbzip2: Fix cross-compilation.
Date: Wed, 30 Mar 2022 06:38:11 -0400

This is an automated email from the git hooks/post-receive script.

mothacehe pushed a commit to branch master
in repository guix.

The following commit(s) were added to refs/heads/master by this push:
     new 2387adf600 gnu: lbzip2: Fix cross-compilation.
2387adf600 is described below

commit 2387adf60022799a8af144ed8dd2b7a46c155374
Author: Brian Kubisiak <brian@kubisiak.com>
AuthorDate: Tue Mar 29 18:45:55 2022 -0700

    gnu: lbzip2: Fix cross-compilation.
    
    * gnu/packages/compression.scm (lbzip2)[arguments]: Search (or
    native-inputs inputs) for gnulib-tool.py.
    
    Signed-off-by: Mathieu Othacehe <othacehe@gnu.org>
---
 gnu/packages/compression.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 3edaecd951..e1d8f721a3 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -411,8 +411,10 @@ decompression.")
        `(#:phases
          (modify-phases %standard-phases
            (add-after 'unpack 'unpack-gnulib
-             (lambda* (#:key inputs #:allow-other-keys)
-               (let ((gnulib (assoc-ref inputs "gnulib")))
+             (lambda* (#:key inputs native-inputs #:allow-other-keys)
+               (let ((gnulib
+                      (dirname (search-input-file (or native-inputs inputs)
+                                                  "gnulib-tool.py"))))
                  (copy-recursively gnulib "lib")
                  (setenv "PATH" (string-append "lib:" (getenv "PATH")))
                  #t)))



reply via email to

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