From patchwork Sun Oct 6 05:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 31667 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 2C84927BBE9; Sun, 6 Oct 2024 06:35:37 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_VALIDITY_CERTIFIED, RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 868CD27BBE2 for ; Sun, 6 Oct 2024 06:35:36 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sxJv6-0007Fz-E4; Sun, 06 Oct 2024 01:35:04 -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 1sxJv3-0007CY-Gu for guix-patches@gnu.org; Sun, 06 Oct 2024 01:35:01 -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 1sxJv3-00061I-7x for guix-patches@gnu.org; Sun, 06 Oct 2024 01:35:01 -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=egBP0XisrdPpNyJ7YBAR8Y7z9/B2hULjriZxAtbeDtk=; b=UPMzVjU4VEAlC2axn+zkVtE90xXzw4pP9SEkLv/iuskAwiMruqUxuPluU7WdoboHx9L9lDj2P8f1O/lhljX9qDl9XfT9o44zo1/6G0yynTMvME01agdbanlF6GwHv/sjHyfQXdVBdvAvygfYht9OBoJMIVNqAHt+kglAiXZHNmB5iCm4SBw3aNeqvNhLXr4eoSR8HunynKLZ/PUWhUzZNmQDQmmcojHn40HlFNkpyB+s1Jy9sVSG35mOI7u1pvQp477Vy0PnHW7YGxRBThA4bVzf2AjaCyJKwL6cDaAe1060rYj7EWScgZhd0knwi6I0ARIReOZSaMIsRh/RXaW+Og==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sxJv6-0000Ij-KG; Sun, 06 Oct 2024 01:35:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73522] [PATCH games-team 09/14] gnu: retroarch: Propagate core assets. 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:04 +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?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Maxim Cournoyer , Sergey Trofimov , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 73522-submit@debbugs.gnu.org id=B73522.1728192856949 (code B ref 73522); Sun, 06 Oct 2024 05:35:04 +0000 Received: (at 73522) by debbugs.gnu.org; 6 Oct 2024 05:34:16 +0000 Received: from localhost ([127.0.0.1]:39846 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxJuK-0000FE-2L for submit@debbugs.gnu.org; Sun, 06 Oct 2024 01:34:16 -0400 Received: from mail-pg1-f178.google.com ([209.85.215.178]:55758) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sxJuI-0000F6-CP for 73522@debbugs.gnu.org; Sun, 06 Oct 2024 01:34:15 -0400 Received: by mail-pg1-f178.google.com with SMTP id 41be03b00d2f7-7e9ff6fb4c6so915350a12.3 for <73522@debbugs.gnu.org>; Sat, 05 Oct 2024 22:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1728192788; x=1728797588; 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=egBP0XisrdPpNyJ7YBAR8Y7z9/B2hULjriZxAtbeDtk=; b=YlEr5KS2TMu6xReOFyzfWZqByIOFZbRseFqBSmf99fXmiWIw544epAKAfO83DHE71x mVKWUTbvALCFkuXISdBLMoOT+jKR23/ouFj/+zf9JEZUwOr8MUJvyX0HWb+U8LL2Q5Vf Wlmdxdz6gZcjD9Qpv2tvFV25BcUt1W/NPVKOswy2LZN7BbigLWF6LQ8lvc3WMtrPV0hd Zaz1RCs48va9gh6qICj62eZI9qzYtfiZDwbkL3MwHahEe9yMHGntry0ySE/YY9SYpmpd t7HBwYHBxxZoMRGx27s5inRzz/Ld8985bTCRhlDbmqUmIvcgYGaGAezGzMZklkP5sK2h 75HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728192788; x=1728797588; 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=egBP0XisrdPpNyJ7YBAR8Y7z9/B2hULjriZxAtbeDtk=; b=n452wyGTT9gRbTPnHAIrEe98csFvPwF2aAoJ0BRWPBJ+HiY2XzQQ5gLW1Uly3L6/2S TzBswjonSO1mYmAIv016WuztLEoKMKobY1aWT1MDtT9ZGitG0NNXifxLqDWyDKmj2ix8 uH3No+ULmD4GP+Pk2wXcoHu04RzJclt3uFtzCVZEf28vO0YEFw/FyyGd3qJDuE/4D0Q5 swpx92kyKiYsuXGD5tjJws4FPga6JTQhKhcSt2Ge6uIrqmBkYnlK43C7FE3HHoRKX35G PCp4QKLwCaBWJawbQQeGidQJc0q/Hr53DtlM5aAiMftfuOh97jml8OvToP8q4B4wYsov DRWQ== X-Gm-Message-State: AOJu0YxPFbD2XHU1r27nNywyV+Qx1gquNDqkVxVE1M4W6WUe3MONB39/ cNdGVDSX0ODZKFrFHch15CuW8O9JDs2G5CZcwkfwWNVqpuHUSk6g8iNPgQ== X-Google-Smtp-Source: AGHT+IEuMPczqJbZRrgCEoI77ZFXIz0aUQz/JYPEDUxPJE2iZrmOIAX5zPH5sWrlhBMOk8HifDFblQ== X-Received: by 2002:a05:6a20:c707:b0:1d5:2f56:9ff4 with SMTP id adf61e73a8af0-1d6dfa40e45mr12925896637.27.1728192787746; Sat, 05 Oct 2024 22:33:07 -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.33.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 05 Oct 2024 22:33:07 -0700 (PDT) From: Maxim Cournoyer Date: Sun, 6 Oct 2024 14:32:05 +0900 Message-ID: <115d96622d4fe66f8152d6581307c13b2293d508.1728192708.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.46.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches The RetroArch menus will not correctly render without its assets, the plugins won't be usable without the core info files, and controllers won't be usable without joypad-autoconfig files. Hence... * gnu/packages/emulators.scm (retroarch-minimal): New variable, renamed from previous retroarch. (retroarch) [propagated-inputs]: New field. Change-Id: I9dccf89da1f35acfa705de9ae02ae5f72a0b1825 --- gnu/packages/emulators.scm | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm index 63c2594f94..4baebbdbd0 100644 --- a/gnu/packages/emulators.scm +++ b/gnu/packages/emulators.scm @@ -118,7 +118,8 @@ (define-module (gnu packages emulators) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system pyproject) - #:use-module (guix build-system qt)) + #:use-module (guix build-system qt) + #:use-module (guix build-system trivial)) (define-public vice (package @@ -1577,9 +1578,9 @@ (define-public retroarch-joypad-autoconfig physical device and the RetroPad virtual controller.") (license license:expat))) -(define-public retroarch +(define-public retroarch-minimal (package - (name "retroarch") + (name "retroarch-minimal") (version "1.19.1") (source (origin @@ -1737,6 +1738,23 @@ (define-public retroarch license:bsd-3 ;feragamemode, ibxm license:gpl2+)))) ;switchres +(define-public retroarch + (package + (inherit retroarch-minimal) + (name "retroarch") + (source #f) + (build-system trivial-build-system) + (arguments (list #:builder #~(mkdir #$output))) + (propagated-inputs + (list retroarch-minimal + ;; We cannot simply hard-code the resource paths, as they'd written + ;; to ~/.config/retroarch.cfg and never updated (going stale), + ;; which is problematic. The environment variables overrides the + ;; configuration file values. + retroarch-assets + retroarch-core-info + retroarch-joypad-autoconfig)))) + (define-public wasm4 (package (name "wasm4")