diff mbox series

[bug#54618,v2] gnu: lbzip2: Fix cross-compilation.

Message ID 20220330014555.tucyos5b36qxzmd5@peregrine
State Accepted
Headers show
Series [bug#54618,v2] gnu: lbzip2: Fix cross-compilation. | expand

Commit Message

Brian Kubisiak March 30, 2022, 1:45 a.m. UTC 
* gnu/packages/compression.scm (lbzip2)[arguments]: Search (or
native-inputs inputs) for gnulib-tool.py.
---
 gnu/packages/compression.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Comments

Mathieu Othacehe March 30, 2022, 10:39 a.m. UTC | #1 
> * gnu/packages/compression.scm (lbzip2)[arguments]: Search (or
> native-inputs inputs) for gnulib-tool.py.

Pushed as 2387adf60022799a8af144ed8dd2b7a46c155374.

Thanks,

Mathieu
diff mbox series

Patch

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 @@  (define-public lbzip2
        `(#: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)))