From 6930741eb5577da41df7b6769f1c028dfaac8556 Mon Sep 17 00:00:00 2001
From: Brian Kubisiak <brian@kubisiak.com>
Date: Tue, 3 Dec 2024 19:17:55 -0800
Subject: gnu: squashfuse: Fix cross compiling.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/file-systems.scm (squashfuse)[arguments]: Use
pkg-config-for-target.
(squashfuse-for-appimage)[arguments]: Use substitute-keyword-arguments
to modify inherited phases instead of %standard-phases.

Change-Id: I6e52a94e46c5a89ba215a7eaceb7f54a80c52429
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
---
 gnu/packages/file-systems.scm | 26 ++++++++++++++++++--------
 1 file changed, 18 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/file-systems.scm')

diff --git a/gnu/packages/file-systems.scm b/gnu/packages/file-systems.scm
index 477f4d0d24..778cba53ed 100644
--- a/gnu/packages/file-systems.scm
+++ b/gnu/packages/file-systems.scm
@@ -2049,6 +2049,15 @@ the XDG directory specification from @file{~/.@var{name}} to
        (sha256
         (base32 "03aw8pw8694jyrzpnbry05rk9718sqw66kiyq878bbb679gl7224"))))
     (build-system gnu-build-system)
+    (arguments
+     (list
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'unpack 'fix-cross-compile
+            (lambda _
+              (substitute* "autogen.sh"
+                (("pkg-config")
+                 #$(pkg-config-for-target))))))))
     (native-inputs (list autoconf automake libtool pkg-config))
     (inputs (list attr fuse-2 xz zlib `(,zstd "lib")))
     (home-page "https://github.com/vasi/squashfuse")
@@ -2063,17 +2072,18 @@ memory-efficient.")
     (package
       (inherit squashfuse)
       (arguments
-       (list
+       (cons*
         #:configure-flags
         #~'("CFLAGS=-ffunction-sections -fdata-sections -Os -no-pie"
             "LDFLAGS=-static")
-        #:phases
-        #~(modify-phases %standard-phases
-            (add-after 'install 'install-private-headers
-              (lambda _
-                (install-file "fuseprivate.h"
-                              (string-append #$output
-                                             "/include/squashfuse/")))))))
+        (substitute-keyword-arguments (package-arguments squashfuse)
+          ((#:phases phases)
+           #~(modify-phases #$phases
+               (add-after 'install 'install-private-headers
+                 (lambda _
+                   (install-file "fuseprivate.h"
+                                 (string-append #$output
+                                                "/include/squashfuse/")))))))))
       (inputs (list fuse-for-appimage
                     `(,zstd "lib")
                     `(,zstd "static")
-- 
cgit v1.2.3