From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id QOfXI5ohAmeWeAEAqHPOHw:P1 (envelope-from ) for ; Sun, 06 Oct 2024 05:35:22 +0000 Received: from aspmx1.migadu.com ([2001:41d0:403:4876::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0.migadu.com with LMTPS id QOfXI5ohAmeWeAEAqHPOHw (envelope-from ) for ; Sun, 06 Oct 2024 07:35:22 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TI30Tr4a; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ho5Ppu43; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1728192922; a=rsa-sha256; cv=none; b=PsbmH/WyD8Im5zhnrEmUILlqSnue2UdtUBOM5595nxC+IP4tV1esy5qJmI3rQ+BLzH/2rt mfh3DFa8qRcyougGxwDYY86dv3nRo2DSZMWTFv4VhcJcYRH282E5gy5AMiy/qz7NeEtrDG JGHMBth2aZyC6V4T+MbHu9UmbQ4bZvoZZtvdCItwhULksNNni+EDMNxGDDhqCeCR+KaaRa NTiuj5H1JmmGo/9F88xam7XAJ8/pgqoOB2tzK0rF/AxCS2t03SxQ8V16Q2DhqCQbI1CWtd IxFONOfeW+Nq+QDzcbX+Rh6G92jMYonV3MTejD2SRo1ASMaRBfvQSrTOVOeVvg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=TI30Tr4a; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=Ho5Ppu43; dmarc=fail reason="SPF not aligned (relaxed), DKIM not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1728192922; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=4PW960AvLu1WP1/tXkgbUW+zX9CsyN2DGSUB1hcaWus=; b=u3Z+wAoU+N1Ldzwltg019+3JJgtnEb6yWz65xippf3vDygmJ3EoUwEel23g1xYoEZiSO3B Rtf/j8YzRhua3uC5niVJzbEzoomo2zG5qRClgkYUNjy6fWtITBUuj+0somLG60oN3hLUaf epJZ0uIpEzyjVpTiu2AoYd7u2eandiBbH1bajUI0HlEU0VDH4yQOLhMpSizUrM3Rq+QRce qyyH/7oRvGo5nQH+ecqLYmM9mwovfs5rP0ICydSy5PF45ZV19gxXaCg7uti0sW/49E31VV T3jtPC2im5D18BnguVzGnDezrL5q9UwtYJ77kyRnaT86QjYmytzPpLhy1GsTzA== Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B42CB82F59 for ; Sun, 06 Oct 2024 07:35:20 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxJv2-0007Bt-94; Sun, 06 Oct 2024 01:35:00 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sxJv1-0007BP-9X for guix-patches@gnu.org; Sun, 06 Oct 2024 01:34:59 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1sxJv0-000610-WD for guix-patches@gnu.org; Sun, 06 Oct 2024 01:34:59 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=4PW960AvLu1WP1/tXkgbUW+zX9CsyN2DGSUB1hcaWus=; b=TI30Tr4a5V0SIRTyi8KgXxUwWozSK0f6TFp29obtl7t6IBvZskHtTdSRzT4idMvOG8UBe9dRVYV45ZWT0LOibVCS7zMSDiaqRm7ucAahBsf4mH8y9jAcFh2qEIUHEKcnxZ2zWDoJRAE23C4/ii728I2YGwrAdEpJbCOMe+W5MS+U5nt9QIzMHP0a0t0Z5Q734qzXEOKqxcKYXpgGhTnIotEEBDNIJ2nUFq2xS3Ftnx3JE+OzMG7ZwOl1k84IczYqwhBTWCfrNowUTmgyvqJDbuH50IHPdXhmrTWvj3I5NmmiSRQC6fzjBASWP114kOieRWRLKjQI8QaKgGbeyNeuJQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxJv4-0000I6-HP; Sun, 06 Oct 2024 01:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73522] [PATCH games-team 04/14] gnu: retroarch: Use gexps. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, sarg@sarg.org.ru, adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 06 Oct 2024 05:35:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73522 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73522@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Sergey Trofimov , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Sergey Trofimov , Adam Faiz , Liliana Marie Prikler , =?UTF-8?Q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Received: via spool by 73522-submit@debbugs.gnu.org id=B73522.1728192848874 (code B ref 73522); Sun, 06 Oct 2024 05:35:02 +0000 Received: (at 73522) by debbugs.gnu.org; 6 Oct 2024 05:34:08 +0000 Received: from localhost ([127.0.0.1]:39828 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxJuB-0000Dz-IB for submit@debbugs.gnu.org; Sun, 06 Oct 2024 01:34:07 -0400 Received: from mail-pf1-f180.google.com ([209.85.210.180]:45344) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxJu8-0000Cd-OH for 73522@debbugs.gnu.org; Sun, 06 Oct 2024 01:34:06 -0400 Received: by mail-pf1-f180.google.com with SMTP id d2e1a72fcca58-71e01207fa0so70953b3a.3 for <73522@debbugs.gnu.org>; Sat, 05 Oct 2024 22:33:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728192773; x=1728797573; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=4PW960AvLu1WP1/tXkgbUW+zX9CsyN2DGSUB1hcaWus=; b=Ho5Ppu43qv6L/VIUmELrTW/CbAZ4RV31st1YmHx7vf7CtyR6pTRgBLdpchK7zudpr1 WgpykY91kewWAp+Ed6FKNoqZG16FIxOAbNe1EGe0vGcpLaSWGfzvIEbKlfp3Z+q1POsN iYjwcoLeqRy8RW7jWbVuuR1IfW0EQHbCxRiniQs9M1q6HB7KWtCSBSNYQunXyAYxxAbF /66qGGbiGOuG5XpCgTW7eGnYbYHeONaqbgaasEucDeeoMOiqoW2k9tvo8oDzkVLwh1iK 4Rj9Z6lIsrOikWO+DxP7fLEDOeOMcOglwad/3PTo0NXIrT9TNJepaBSzbWVyk6QBEOWY Zv6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728192773; x=1728797573; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=4PW960AvLu1WP1/tXkgbUW+zX9CsyN2DGSUB1hcaWus=; b=W0zAuAMJD8jh6bAsPsSqrok3OEbbaxDRS8aIKtHTXMt93ZqZCNjWsa5HOTKqxBuEqt tUZi/TIBl5IiNLsNSvCr74SE36wlQJill3ZbIgTVNm4Ke0ataLlfOzf2KsfIGbjmVPQB Ef138EAE9VXZFiCxG78v5pEvcA2E53PyHdr+iXvy7j7+qIpdUlNvw/MoGp/rXldveajz RL6no1xW9kfzpCe1MiMLiVS/G/I+Z4DqFyaymF3tpihsT0sJmi69vtA/NH4pc46ynCER EefvYtFUmLS1QGv3W1dXAB8S7MDfEYIerpQSPBbaIrjvGNVLmGw+f/r/fWoVC4d/75Q+ 0g4A== X-Gm-Message-State: AOJu0Ywu6XAtIySSp7jWypuBmjpBrTAhtDUUCzS49t6+KmFtI4xHdyDN Cf+2NjUQdtjJ/SMLQKJkDmfrJFHZ0zf8n75GDyoZyqc67A0TkYGJCQmA0A== X-Google-Smtp-Source: AGHT+IGHe+mi6PjYxXgJBRmto8mueWnuvMOT1fkMhfig2acdv+dFHq0LiQNv7siC1u3A7SOWNAeOgg== X-Received: by 2002:a05:6a21:1584:b0:1c8:92ed:7c5e with SMTP id adf61e73a8af0-1d6dfa40ae2mr13609703637.23.1728192772596; Sat, 05 Oct 2024 22:32:52 -0700 (PDT) Received: from hurd.lan ([2405:6586:be0:0:c8ff:1707:9b9:af89]) by smtp.gmail.com with ESMTPSA id 41be03b00d2f7-7e9f6c4a66bsm2575562a12.92.2024.10.05.22.32.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 22:32:52 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 6 Oct 2024 14:32:00 +0900 Message-ID: <1caa6a280efc4efbfc8b62eeb6fab3f661574533.1728192708.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 0.33 X-Spam-Score: 0.33 X-Migadu-Queue-Id: B42CB82F59 X-Migadu-Scanner: mx10.migadu.com X-TUID: XE0tyfzhpese * gnu/packages/emulators.scm (retroarch) [arguments] : 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 . - "--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 . + "--disable-update_cores" + "--disable-builtinmbedtls" + "--disable-builtinbearssl" + "--disable-builtinzlib" + "--disable-builtinflac" + "--disable-builtinglslang")))))) (inputs (list alsa-lib eudev -- 2.46.0