From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp12.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id 6GbIEN/RCWTwLAEASxT56A (envelope-from ) for ; Thu, 09 Mar 2023 13:32:31 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp12.migadu.com with LMTPS id iIBzEN/RCWRn/QAAauVa8A (envelope-from ) for ; Thu, 09 Mar 2023 13:32:31 +0100 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 F26CB8A2A for ; Thu, 9 Mar 2023 13:32:30 +0100 (CET) Authentication-Results: aspmx1.migadu.com; dkim=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"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1678365151; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:list-id:list-help: list-unsubscribe:list-subscribe:list-post; bh=9VQa7wArjVkEUpf0rbbRBo14xBmmVRdpDjHSkT2K+Qc=; b=LPT9A5+8wZquvqEkaCkf4srlnoZEOwpOZZyT4Pdpbgw2gFaH3u0N6DPZAFQ3bQAfmY1+kj a7qF3PfuEUPPqEtpbwn6UfkcGVVZ7x+1RKz60EsaFxdJ9EEv00JOnPO8Bgth7LvcAP9+Kt YROLnEYxeCRlFDhhsqjiEvWtqkKclbAEoQY6+vAqVarcxDVBydUJcmgAFd0LsABVa4qOQK P2bbRU36RbJqf+P3ZJMscye+ix4XwFyT3lGCrfeBTTG3uMsqtsnY741znxky6nX+FSWXZu pv14z1zTb5b4IaZmw+/fQC2ZsW+tNKACN+skMbKi//jpcXdIm8nP28mMs6yNMQ== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1678365151; a=rsa-sha256; cv=none; b=ksODcdzyLpEK3tMns5HP5tD2mDe/WBV0WngPJYCcWSApTRRFNbuVBGEQdx4EqCMSkCaph8 6+aP94elbMC5LTpeLCpUmzNW1lsLAAz+tsIbxSD3S1bRjWAe9lyy1ZnM4mKjAWW58FNrSy HBZbx0UdoDwiN39E/DHTXlmpGgQqyIKL2Sn6eWnF7W94AR0FcLY8sDCrChpvWWdms8Pyql sLIAyvD+tpDw4RAs6w9u3vRUK6fY6q3K1ZSOqFL8X/D3BPYuF96KXH5QmqXZyW52NgFmDd zSHmQTpozAuXGKiYFFvkIhLWnyFCe0BhE86nybnQROef9uQaRsUO+QrRh2hUFQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=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"; dmarc=none Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1paFRE-0001ax-VL; Thu, 09 Mar 2023 07:32:04 -0500 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 1paFRD-0001a9-Gy for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1paFRD-0007ks-6Z for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1paFRD-00069Q-2Q for guix-patches@gnu.org; Thu, 09 Mar 2023 07:32:03 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style. Resent-From: Nicolas Goaziou Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 09 Mar 2023 12:32:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 62075 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62075@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.167836506323561 (code B ref -1); Thu, 09 Mar 2023 12:32:02 +0000 Received: (at submit) by debbugs.gnu.org; 9 Mar 2023 12:31:03 +0000 Received: from localhost ([127.0.0.1]:51110 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQE-00067s-IO for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:03 -0500 Received: from lists.gnu.org ([209.51.188.17]:53392) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1paFQC-00067M-If for submit@debbugs.gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 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 1paFQC-0000xU-BQ for guix-patches@gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: from relay3-d.mail.gandi.net ([2001:4b98:dc4:8::223]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1paFQA-0007cT-Kc for guix-patches@gnu.org; Thu, 09 Mar 2023 07:31:00 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 88E0F60006 for ; Thu, 9 Mar 2023 12:30:54 +0000 (UTC) From: Nicolas Goaziou Date: Thu, 9 Mar 2023 13:30:46 +0100 Message-Id: <20230309123047.70497-1-mail@nicolasgoaziou.fr> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2001:4b98:dc4:8::223; envelope-from=mail@nicolasgoaziou.fr; helo=relay3-d.mail.gandi.net X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: X-Migadu-Scanner: scn0.migadu.com X-Migadu-Queue-Id: F26CB8A2A X-Spam-Score: -1.10 X-Migadu-Spam-Score: -1.10 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-Flow: FLOW_IN X-Migadu-Country: US X-TUID: bBoBt+CljgG0 * gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions. [native-inputs]: Remove labels. Re-order alphabetically. --- gnu/packages/games.scm | 65 ++++++++++++++++++++---------------------- 1 file changed, 31 insertions(+), 34 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 2946c787af..d057823832 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -954,43 +954,40 @@ (define-public cataclysm-dda (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) - "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" - "LOCALIZE=1" "LANGUAGES=all") - #:phases - (modify-phases %standard-phases - (delete 'configure) - ;; Apparently we can't do make on both tiles and a console version at - ;; the same time anymore, so we have to either "make clean" between - ;; builds or do some other hackery. See: - ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746 - (add-after 'install 'make-clean-pre-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - ;; Change prefix directory and enable tile graphics and sound. - (invoke "make" "clean"))) - (add-after 'make-clean-pre-tiles 'build-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - ;; Change prefix directory and enable tile graphics and sound. - (apply invoke "make" "TILES=1" "SOUND=1" - (string-append "PREFIX=" - (assoc-ref outputs "tiles")) - (cdr make-flags)))) - (add-after 'build-tiles 'install-tiles - (lambda* (#:key make-flags outputs #:allow-other-keys) - (apply invoke "make" "install" "TILES=1" "SOUND=1" - (string-append "PREFIX=" - (assoc-ref outputs "tiles")) - (cdr make-flags))))) - ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native - ;; input in order to support tests. - #:tests? #f)) + (list + #:make-flags + #~(list (string-append "PREFIX=" #$output) + "USE_HOME_DIR=1" "DYNAMIC_LINKING=1" "RELEASE=1" + "LOCALIZE=1" "LANGUAGES=all") + #:phases + #~(modify-phases %standard-phases + (delete 'configure) + ;; Apparently we can't do make on both tiles and a console version at + ;; the same time anymore, so we have to either "make clean" between + ;; builds or do some other hackery. See: + ;; https://github.com/CleverRaven/Cataclysm-DDA/issues/42598#issuecomment-667702746 + (add-after 'install 'make-clean-pre-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + ;; Change prefix directory and enable tile graphics and sound. + (invoke "make" "clean"))) + (add-after 'make-clean-pre-tiles 'build-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + ;; Change prefix directory and enable tile graphics and sound. + (apply invoke "make" "TILES=1" "SOUND=1" + (string-append "PREFIX=" #$output:tiles) + (cdr make-flags)))) + (add-after 'build-tiles 'install-tiles + (lambda* (#:key make-flags outputs #:allow-other-keys) + (apply invoke "make" "install" "TILES=1" "SOUND=1" + (string-append "PREFIX=" #$output:tiles) + (cdr make-flags))))) + ;; TODO: Add libtap++ from https://github.com/cbab/libtappp as a native + ;; input in order to support tests. + #:tests? #f)) (outputs '("out" "tiles")) ;for tile graphics and sound support (native-inputs - `(("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("astyle" ,astyle))) + (list astyle gettext-minimal pkg-config)) (inputs (list freetype libogg base-commit: 5befcff66edb4d72ab8e713c81836fb8519ce3e6 -- 2.39.2