From 08235b1973a371a58a13e74e5e446d5ee8a5c999 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 5 Mar 2026 11:21:29 +0200
Subject: [PATCH] gnu: mesa: Add more dependencies for freedreno driver.

* gnu/packges/gl.scm (mesa)[inputs]: When building for arm targets add
lua-5.4 and libarchive.

Change-Id: I92bee30cda7e218d64c7b6e5c0a3e74e9ccd69df
---
 gnu/packages/gl.scm | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/gnu/packages/gl.scm b/gnu/packages/gl.scm
index 9a75a2bc1b..83cc7c3a99 100644
--- a/gnu/packages/gl.scm
+++ b/gnu/packages/gl.scm
@@ -43,6 +43,7 @@
 (define-module (gnu packages gl)
   #:use-module (gnu packages)
   #:use-module (gnu packages autotools)
+  #:use-module (gnu packages backup)
   #:use-module (gnu packages bison)
   #:use-module (gnu packages build-tools)
   #:use-module (gnu packages check)
@@ -57,6 +58,7 @@
   #:use-module (gnu packages image)
   #:use-module (gnu packages linux)
   #:use-module (gnu packages llvm)
+  #:use-module (gnu packages lua)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages python)
   #:use-module (gnu packages python-build)
@@ -339,22 +341,28 @@ also known as DXTn or DXTC) for Mesa.")
            libxxf86vm
            xorgproto))
     (inputs
-     (cons* elfutils                   ;libelf required for r600 when using llvm
-            expat
-            (force libva-without-mesa)
-            libxml2
-            libxrandr
-            libxvmc
-            llvm-for-mesa
-            vulkan-loader
-            wayland
-            wayland-protocols
-            `(,zstd "lib")
-            ;; Rust isn't needed for all architectures.
-            (if (target-x86-64?)
-                ;; NVK dependencies
-                (cargo-inputs 'mesa)
-                '())))
+     (append
+       (list elfutils                  ;libelf required for r600 when using llvm
+             expat
+             (force libva-without-mesa)
+             libxml2
+             libxrandr
+             libxvmc
+             llvm-for-mesa
+             vulkan-loader
+             wayland
+             wayland-protocols
+             `(,zstd "lib"))
+       ;; The freedreno driver wants libarchive and lua.
+       (if (target-arm?)
+           (list libarchive
+                 lua-5.4)
+           '())
+       ;; Rust isn't needed for all architectures.
+       (if (target-x86-64?)
+           ;; NVK dependencies
+           (cargo-inputs 'mesa)
+           '())))
     (native-inputs
      (append
       (list bison