From patchwork Sun Jun 16 21:43:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Smith X-Patchwork-Id: 65406 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 EF77D27BBE9; Sun, 16 Jun 2024 22:46:12 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 BB1D027BBE2 for ; Sun, 16 Jun 2024 22:46:12 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sIxhM-0006eq-1p; Sun, 16 Jun 2024 17:46: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 1sIxhK-0006eg-DB for guix-patches@gnu.org; Sun, 16 Jun 2024 17:46:02 -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 1sIxhK-0001eb-4V for guix-patches@gnu.org; Sun, 16 Jun 2024 17:46:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sIxhK-0002PL-8o; Sun, 16 Jun 2024 17:46:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71600] [PATCH 2/2] gnu: quakespasm: Update package style. Resent-From: James Smith Original-Sender: "Debbugs-submit" Resent-CC: adam.faiz@disroot.org, liliana.prikler@gmail.com, iyzsong@envs.net, guix-patches@gnu.org Resent-Date: Sun, 16 Jun 2024 21:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71600 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71600@debbugs.gnu.org Cc: James Smith , Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= X-Debbugs-Original-Xcc: Adam Faiz , Liliana Marie Prikler , =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71600-submit@debbugs.gnu.org id=B71600.17185743019153 (code B ref 71600); Sun, 16 Jun 2024 21:46:02 +0000 Received: (at 71600) by debbugs.gnu.org; 16 Jun 2024 21:45:01 +0000 Received: from localhost ([127.0.0.1]:56524 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIxgL-0002NK-9D for submit@debbugs.gnu.org; Sun, 16 Jun 2024 17:45:01 -0400 Received: from layka.disroot.org ([178.21.23.139]:41096) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sIxgK-0002N2-Dw for 71600@debbugs.gnu.org; Sun, 16 Jun 2024 17:45:00 -0400 X-Virus-Scanned: SPAM Filter at disroot.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1718574297; bh=aW1w82nAWR0EfhhepqumCbB31Tet3dxmLfaWSjiFri8=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=ZAw8V90WivFwpFKQPVNk8yCHOwu5a5Z165FxmIOVLPBFp8uEtvDTfuojisNHDx7en BKxwTczhuZFfLG4CUp+OSYKuUzjEXY9IrGD67Su5X6yHKAm4VPbTRBsQSOZ7+r6aaH 6lXFOMTWcBBVV5iw4F/qMSL1eCnGjy67hZtQzg/TNz8KeFPcVkGH2/P347ko6tWuqd LpdGvC9G4QZr55E/MmCU+qQ24O7ZeX7H+Xalr/s9m4W5sWQ0MmEjceo2Zmyxp2Pnq3 dxkgIXsbLSTrvTwE3g6j5KvqsHy3tsPYx7OfnphYt441KflMrBPMmA7O7YEy5bVPJq TQUJu7OqlfmMA== Date: Sun, 16 Jun 2024 14:43:13 -0700 Message-ID: <65f17f61a595030f40a0aaee3db0f7bc3f46b840.1718573761.git.jsubuntuxp@disroot.org> 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: , Reply-to: James Smith X-ACL-Warn: , James Smith via Guix-patches X-Patchwork-Original-From: James Smith via Guix-patches via From: James Smith 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 * gnu/packages/games.scm (quakespasm)[arguments]: Use gexps. <#:make-flags>: Set compiler to (cc-for-target) instead of hardcoding to gcc. <#:phases>: Simplify fix-makefile-paths and remove trailing #t. Change-Id: I250a842c78f2f49b451e5df76509fbe6fa1b4576 --- gnu/packages/games.scm | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 8d1450db01..5fe402d2eb 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -7676,23 +7676,21 @@ (define-public quakespasm (sha256 (base32 "0hr58w1d2yw82vm9lkln05z6d4sjlcr6grxhf6sqdqwyfy9nv1mw")))) (arguments - `(#:tests? #f - #:make-flags '("CC=gcc" - "MP3LIB=mpg123" - "USE_CODEC_FLAC=1" - "USE_CODEC_MIKMOD=1" - "USE_SDL2=1" - "-CQuake") - #:phases (modify-phases %standard-phases - (delete 'configure) - (add-after 'unpack 'fix-makefile-paths - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/bin")) - (substitute* "Quake/Makefile" - (("/usr/local/games") - (string-append out "/bin"))) - #t)))))) + (list #:tests? #f + #:make-flags #~(list (string-append "CC=" #$(cc-for-target)) + "MP3LIB=mpg123" + "USE_CODEC_FLAC=1" + "USE_CODEC_MIKMOD=1" + "USE_SDL2=1" + "-CQuake") + #:phases #~(modify-phases %standard-phases + (delete 'configure) + (add-after 'unpack 'fix-makefile-paths + (lambda _ + (mkdir-p (string-append #$output "/bin")) + (substitute* "Quake/Makefile" + (("/usr/local/games") + (string-append #$output "/bin")))))))) (build-system gnu-build-system) (inputs (list libmikmod libvorbis