guix-commits
[Top][All Lists]
Advanced

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

02/03: gnu: snappy: Cross-compile.


From: guix-commits
Subject: 02/03: gnu: snappy: Cross-compile.
Date: Sat, 6 Nov 2021 12:57:31 -0400 (EDT)

mbakke pushed a commit to branch core-updates-frozen
in repository guix.

commit 3c6cbd866c44542297da09f9d00392b52acc99e5
Author: Marius Bakke <marius@gnu.org>
AuthorDate: Fri Nov 5 16:51:15 2021 +0100

    gnu: snappy: Cross-compile.
    
    * gnu/packages/compression.scm (snappy)[arguments]: Adjust
    unpack-third_party-subprojects phase to look up inputs from NATIVE-INPUTS in
    addition to INPUTS.
---
 gnu/packages/compression.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/compression.scm b/gnu/packages/compression.scm
index 0deb8f3..709fc23 100644
--- a/gnu/packages/compression.scm
+++ b/gnu/packages/compression.scm
@@ -1223,11 +1223,12 @@ well as bzip2.")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'unpack-third_party-subprojects
-           (lambda* (#:key inputs #:allow-other-keys)
+           (lambda* (#:key native-inputs inputs #:allow-other-keys)
              (with-directory-excursion "third_party"
                (for-each (lambda (subproject)
                            (let* ((input (string-append subproject "-source"))
-                                  (source (assoc-ref inputs input)))
+                                  (source (assoc-ref (or native-inputs inputs)
+                                                     input)))
                              (with-directory-excursion subproject
                                ;; Take advantage of the coincidence that both
                                ;; use GIT-FETCH, which creates a directory.



reply via email to

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