From 0ac95b4490f2b661370b29980f6f01d28d03db6a Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Mon, 17 May 2021 22:33:57 -0400 Subject: gnu: disarchive: Fix build when cross-compiling. This follows commit 0b1f70d1a7, which inadvertently broke the build of Guix for i586-pc-gnu (Hurd). * gnu/packages/patches/disarchive-cross-compilation.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it. * gnu/packages/backup.scm (disarchive)[source]: Apply it. [phases]{delete-configure}: New phase. [native-inputs]: Add guile-3.0 and guile-gcrypt. --- gnu/packages/backup.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'gnu/packages/backup.scm') diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index f3d51e9983..5e0009472e 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -1103,12 +1103,20 @@ backup.") "disarchive-" version ".tar.gz")) (sha256 (base32 - "1jypk0gdwxqbqxiblww863nzq0kwnc676q68j32sprqd7ilnq02s")))) + "1jypk0gdwxqbqxiblww863nzq0kwnc676q68j32sprqd7ilnq02s")) + (patches (search-patches "disarchive-cross-compilation.patch")))) (build-system gnu-build-system) + (arguments + `(#:phases (modify-phases %standard-phases + (add-after 'unpack 'delete-configure + (lambda _ + (delete-file "configure")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) ("pkg-config" ,pkg-config) + ("guile" ,guile-3.0) ;for cross-compilation + ("guile-gcrypt" ,guile-gcrypt) ("guile-quickcheck" ,guile-quickcheck))) (inputs `(("guile" ,guile-3.0) -- cgit v1.2.3