unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
From: Maxim Cournoyer <maxim.cournoyer@gmail.com>
To: 73522@debbugs.gnu.org
Cc: "Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Maxim Cournoyer" <maxim.cournoyer@gmail.com>,
	"Sergey Trofimov" <sarg@sarg.org.ru>,
	"Adam Faiz" <adam.faiz@disroot.org>,
	"Liliana Marie Prikler" <liliana.prikler@gmail.com>,
	宋文武 <iyzsong@envs.net>
Subject: [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps.
Date: Sun,  6 Oct 2024 14:32:00 +0900	[thread overview]
Message-ID: <1caa6a280efc4efbfc8b62eeb6fab3f661574533.1728192708.git.maxim.cournoyer@gmail.com> (raw)
In-Reply-To: <cover.1728192708.git.maxim.cournoyer@gmail.com>

* gnu/packages/emulators.scm (retroarch) [arguments]
<phases>: Use gexps; locate resources using `search-input-file' and
`search-input-directory'.

Change-Id: I0b1c4ff074e6f8287c14ac3327a8d0271391fec2
---

 gnu/packages/emulators.scm | 70 ++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index a1e5a1f0c9..92156f10df 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1592,43 +1592,41 @@ (define-public retroarch
         (base32 "15nh4y4vpf4n1ryhiy4fwvzn5xz5idzfzn9fsi5v9hzp25vbjmrm"))))
     (build-system gnu-build-system)
     (arguments
-     `(#:tests? #f                      ; no tests
-       #:phases
-       (modify-phases %standard-phases
-         (replace 'configure
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (let* ((out (assoc-ref outputs "out"))
-                    (etc (string-append out "/etc"))
-                    (vulkan (assoc-ref inputs "vulkan-loader"))
-                    (wayland-protocols (assoc-ref inputs "wayland-protocols")))
-               ;; Hard-code some store file names.
-               (substitute* "gfx/common/vulkan_common.c"
-                 (("libvulkan.so") (string-append vulkan "/lib/libvulkan.so")))
-               (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
-                 (("/usr/local/share/wayland-protocols")
-                 (string-append wayland-protocols "/share/wayland-protocols")))
-
-               ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
-               (substitute* "qb/config.libs.sh"
-                 (("[$]HAVE_GLSLANG_HLSL") "notcare"))
-
-               ;; The configure script does not yet accept the extra arguments
-               ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
-               (invoke
-                 "./configure"
-                 ,@(if (string-prefix? "armhf" (or (%current-target-system)
+     (list
+      #:tests? #f                       ; no tests
+      #:phases
+      #~(modify-phases %standard-phases
+          (replace 'configure
+            (lambda* (#:key inputs #:allow-other-keys)
+              ;; Hard-code some store file names.
+              (substitute* "gfx/common/vulkan_common.c"
+                (("libvulkan.so")
+                 (search-input-file inputs "lib/libvulkan.so")))
+              (substitute* "gfx/common/wayland/generate_wayland_protos.sh"
+                (("/usr/local/share/wayland-protocols")
+                 (search-input-directory inputs "share/wayland-protocols")))
+
+              ;; Without HLSL, we can still enable GLSLANG and Vulkan support.
+              (substitute* "qb/config.libs.sh"
+                (("[$]HAVE_GLSLANG_HLSL") "notcare"))
+
+              ;; The configure script does not yet accept the extra arguments
+              ;; (like ‘CONFIG_SHELL=’) passed by the default configure phase.
+              (invoke
+               "./configure"
+               #$@(if (string-prefix? "armhf" (or (%current-target-system)
                                                   (%current-system)))
-                       '("--enable-neon" "--enable-floathard")
-                       '())
-                 (string-append "--prefix=" out)
-                 ;; Non-free software are available through the core updater,
-                 ;; disable it.  See <https://issues.guix.gnu.org/38360>.
-                 "--disable-update_cores"
-                 "--disable-builtinmbedtls"
-                 "--disable-builtinbearssl"
-                 "--disable-builtinzlib"
-                 "--disable-builtinflac"
-                 "--disable-builtinglslang")))))))
+                      '("--enable-neon" "--enable-floathard")
+                      '())
+               (string-append "--prefix=" #$output)
+               ;; Non-free software are available through the core updater,
+               ;; disable it.  See <https://issues.guix.gnu.org/38360>.
+               "--disable-update_cores"
+               "--disable-builtinmbedtls"
+               "--disable-builtinbearssl"
+               "--disable-builtinzlib"
+               "--disable-builtinflac"
+               "--disable-builtinglslang"))))))
     (inputs
      (list alsa-lib
            eudev
-- 
2.46.0





  parent reply	other threads:[~2024-10-06  5:35 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-09-28  0:29 [bug#73522] [PATCH 0/6] Package and use RetroArch assets, plus other improvements Maxim Cournoyer
2024-09-29 12:08 ` Sergey Trofimov
2024-10-06  5:34   ` Maxim Cournoyer
2024-10-06  5:31 ` [bug#73522] [PATCH games-team 00/14] " Maxim Cournoyer
2024-10-06  5:31   ` [bug#73522] [PATCH games-team 01/14] gnu: Add retroarch-assets Maxim Cournoyer
2024-10-06  5:31   ` [bug#73522] [PATCH games-team 02/14] gnu: Add retroarch-core-info Maxim Cournoyer
2024-10-06  5:31   ` [bug#73522] [PATCH games-team 03/14] gnu: Add retroarch-joypad-autoconfig Maxim Cournoyer
2024-10-06  5:32   ` Maxim Cournoyer [this message]
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 05/14] gnu: retroarch: Add missing inputs, upgrade Qt to version 6 Maxim Cournoyer
2024-10-06  7:22     ` Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 06/14] gnu: retroarch: Clean-up source from extraneous bundled libraries Maxim Cournoyer
2024-10-06  6:55     ` Liliana Marie Prikler
2024-10-06  8:12       ` Maxim Cournoyer
2024-10-06 16:26         ` bug#73522: " Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 07/14] gnu: retroarch: Extend search-path support Maxim Cournoyer
2024-10-06  6:58     ` Liliana Marie Prikler
2024-10-06  7:45       ` Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 08/14] gnu: retroarch: Really disable online fetching of cores and resources Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 10/14] gnu: retroarch: Update to 1.19.1-1.48b71d5 Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 11/14] gnu: libretro-lowresnx: Use gexps Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 12/14] gnu: Add libretro-mupen64plus-nx Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 13/14] gnu: Add retroarch-slang-shaders Maxim Cournoyer
2024-10-06  5:32   ` [bug#73522] [PATCH games-team 14/14] gnu: Add libretro-bsnes-jg Maxim Cournoyer
2024-10-06  7:17   ` [bug#73522] [PATCH games-team 00/14] Package and use RetroArch assets, plus other improvements Liliana Marie Prikler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: https://guix.gnu.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1caa6a280efc4efbfc8b62eeb6fab3f661574533.1728192708.git.maxim.cournoyer@gmail.com \
    --to=maxim.cournoyer@gmail.com \
    --cc=73522@debbugs.gnu.org \
    --cc=adam.faiz@disroot.org \
    --cc=iyzsong@envs.net \
    --cc=liliana.prikler@gmail.com \
    --cc=sarg@sarg.org.ru \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).