From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id eHahC9lpwmFtRQAAgWs5BA (envelope-from ) for ; Wed, 22 Dec 2021 00:57:13 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id cHSCB9lpwmGZXQAA1q6Kng (envelope-from ) for ; Tue, 21 Dec 2021 23:57:13 +0000 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 B7A0613198 for ; Wed, 22 Dec 2021 00:57:12 +0100 (CET) Received: from localhost ([::1]:53344 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mzp0J-0001aY-Rn for larch@yhetil.org; Tue, 21 Dec 2021 18:57:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:52300) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0001Z9-H3 for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:44674) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mzp0B-0002s6-7a for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mzp0B-0005ra-7P for guix-patches@gnu.org; Tue, 21 Dec 2021 18:57:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#48952] [PATCH v2 2/6] gnu: superstarfighter: Use godot-build-system. Resent-From: Vinicius Monego Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 21 Dec 2021 23:57:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 48952 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 48952@debbugs.gnu.org Cc: Vinicius Monego Received: via spool by 48952-submit@debbugs.gnu.org id=B48952.164013100022436 (code B ref 48952); Tue, 21 Dec 2021 23:57:03 +0000 Received: (at 48952) by debbugs.gnu.org; 21 Dec 2021 23:56:40 +0000 Received: from localhost ([127.0.0.1]:56202 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozn-0005pn-Sb for submit@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:40 -0500 Received: from mout02.posteo.de ([185.67.36.66]:57707) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mzozl-0005pY-NB for 48952@debbugs.gnu.org; Tue, 21 Dec 2021 18:56:38 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id 0DF3B240104 for <48952@debbugs.gnu.org>; Wed, 22 Dec 2021 00:56:32 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1640130992; bh=kfgI+CY+Ulp7UNlpmRrlYeXQR0mnJ6C6HhjH5LXhYyE=; h=From:To:Cc:Subject:Date:From; b=gxWNnNIWB6olgaMIkDe42th7uqFi0NTSkQKsE2YSDkWCYglNYyq8qslXpGbpPLqbS PJk0edkHawio2WwiZFZD0ZNB8PBuULXHDyx+SbsJqMXth5oOLCKjwBsFcoYLURDNkS yjPXMggMiUtU8Rttu9t/qU0KuuziWn5OkSv7skahulz9UsYzxejCOU7osgKHE/sX8m cmQ4NfOBtM80MkLsaegkTTdX3kai0l/22BkTJt/ZWSer3ChoRe5A32/LlS5RHMHe/d vL0yRrEAxb+rWGxLo9zq0zmUFg9ghKcL7qe6l3chPBYCE3eoXSHdZNg/BSUnV0oxei 86wiZMtt5IdLQ== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4JJYJb2hJsz9rwg; Wed, 22 Dec 2021 00:56:31 +0100 (CET) From: Vinicius Monego Date: Tue, 21 Dec 2021 23:55:44 +0000 Message-Id: <20211221235548.130808-3-monego@posteo.net> In-Reply-To: <20211221235548.130808-1-monego@posteo.net> References: <20211221235548.130808-1-monego@posteo.net> 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" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1640131032; 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=sJolidetvFFMUNnW45SGUBqCqQ5fhpNlmOF3VhxFFmA=; b=DT7U6kaBDZL32iBDKsQb+JprhG+dh+yLrVIohQfK0fb2v4v5xkLry0d31+7wix2c0I/9u1 9zHR60omA9A46VJnv8s0Hc5FWmmDwaWkAEc5g9kGTJuUUMZYNxZqVFgNTStKRRBeunF1I+ 1N7zbNw6nhcAqTN7/FWOyzolUfYzqQGw3Q7V6IwVLVHTc8SYeHrQMYP5WtyVrjB7SiEpvq /WpcjwOWIJ/MkvmH4XQpDu6TiTHQCyNNvgd8C4MINktPRzPVZtJTWRMvNYcKGkuFHCP5X7 O8Axv4MUF0VBXpVzIEoSWDHF30drxNfW16UoR/Ps0m1xM5g2ICz89OlGH/gSVA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1640131032; a=rsa-sha256; cv=none; b=CG1oXv50VZnSYa6PAN9cH62UWi2MT6Ub2Aszk4087YCFrGlpPAFyykMjkCd5wgn9fgXCsE mPLtSxeev21vpUm7VHk97eiXwy6+WyMuue4ymJVVlY7vNcDVxXhoB2ZlwlSPbWYRFYfMK+ Nny3Iqcq/9mo4KlhLE4ulI8wHBNpQTW9GLuhmPuhaTaZPVS6tIX9Bo2IYS5xFKALr9yTS6 1BW7g6Io/Mwxqel+DitdD/MQ/cVtDE9YTKlHLHI9Adv1gWgZli19f+QsXAlQ4Mur+/V5k6 WHRIEMpjy2YqWa0awrjgyLDs/GOxo+6fNl4IHjC3qgcrJoOAE/AXoGjGGem93w== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gxWNnNIW; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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" X-Migadu-Spam-Score: -1.53 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=posteo.net header.s=2017 header.b=gxWNnNIW; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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" X-Migadu-Queue-Id: B7A0613198 X-Spam-Score: -1.53 X-Migadu-Scanner: scn0.migadu.com X-TUID: Mb5OJgXfz6kW * gnu/packages/games.scm (superstarfighter)[build-system]: Use godot-build-system. [arguments]: Remove #:tests?. <#:game, #:project-directory>: New fields. <#:phases>: Do not replace configure, build and install. Add phase 'install-desktop-file after 'install. --- gnu/packages/games.scm | 54 +++++++++--------------------------------- 1 file changed, 11 insertions(+), 43 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6258d65f97..a701f7aa94 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -67,6 +67,7 @@ ;;; Copyright © 2021 Petr Hodina ;;; Copyright © 2021 Brendan Tildesley ;;; Copyright © 2021 Christopher Baines +;;; Copyright © 2021 Vinicius Monego ;;; ;;; This file is part of GNU Guix. ;;; @@ -209,6 +210,7 @@ #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) + #:use-module (guix build-system godot) #:use-module (guix build-system meson) #:use-module (guix build-system perl) #:use-module (guix build-system python) @@ -2562,59 +2564,25 @@ modify quests for the Solarus engine."))) (commit "32521f467616bb390e3929d07e1936ff43fe64da"))) (file-name (git-file-name name version)) (sha256 + (base32 "1ckghzrfgvk9z1n5f4ivnamm6s8h9sbv0a3aq9pp4a3yrhkgld0k")))) - (build-system gnu-build-system) + (build-system godot-build-system) (arguments - `(#:tests? #f ;there are no tests + `(#:game ,name + #:project-directory "godot" #:phases (modify-phases %standard-phases - (replace 'configure - (lambda _ - (chdir "godot") - (setenv "HOME" (getcwd)) - (with-output-to-file "export_presets.cfg" - (lambda () - (display - "[preset.0] -name=\"Guix\" -platform=\"Linux/X11\" -runnable=true -[preset.0.options]"))) - #t)) - (replace 'build - (lambda _ - (let ((godot (assoc-ref %build-inputs "godot-headless"))) - (invoke (string-append godot "/bin/godot_server") - "--export-pack" "Guix" - "superstarfighter.pck" "project.godot")) - #t)) - (replace 'install - (lambda* (#:key inputs outputs #:allow-other-keys) + (add-after 'install 'install-desktop-file + (lambda* (#:key inputs outputs game #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) - (bin (string-append out "/bin")) - (share (string-append out "/share")) - (data (string-append share "/superstarfighter")) - (icons (string-append share "/icons/hicolor/256x256/apps"))) - (install-file "superstarfighter.pck" data) - (mkdir-p bin) - (call-with-output-file (string-append bin "/superstarfighter") - (lambda (port) - (format port - "#!/bin/sh~@ - exec ~a/bin/godot --main-pack ~a/superstarfighter.pck~%" - (assoc-ref inputs "godot") - data) - (chmod port #o755))) - (mkdir-p icons) - (copy-file "icon.png" (string-append icons "/" ,name ".png")) + (share (string-append out "/share"))) (make-desktop-entry-file - (string-append share "/applications/" ,name ".desktop") + (string-append share "/applications/" game ".desktop") #:name "SuperStarfighter" #:comment "Fast-paced arcade combat game" #:exec ,name #:icon ,name - #:categories '("Game" "ArcadeGame"))) - #t))))) + #:categories '("Game" "ArcadeGame")))))))) (native-inputs `(("godot-headless" ,godot "headless"))) (inputs -- 2.30.2