From debbugs-submit-bounces@debbugs.gnu.org Thu Mar 09 07:31:03 2023 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 To: guix-patches@gnu.org Subject: [PATCH 1/2] gnu: cataclysm-dda: Improve package style. 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-Spam-Score: -1.6 (-) X-Debbugs-Envelope-To: submit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -2.6 (--) * 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 From debbugs-submit-bounces@debbugs.gnu.org Fri Mar 10 15:21:13 2023 Received: (at 62075-done) by debbugs.gnu.org; 10 Mar 2023 20:21:13 +0000 Received: from localhost ([127.0.0.1]:55931 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pajEj-0000JP-QZ for submit@debbugs.gnu.org; Fri, 10 Mar 2023 15:21:12 -0500 Received: from relay4-d.mail.gandi.net ([217.70.183.196]:59241) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1pajEf-0000IT-FJ for 62075-done@debbugs.gnu.org; Fri, 10 Mar 2023 15:21:09 -0500 Received: (Authenticated sender: admin@nicolasgoaziou.fr) by mail.gandi.net (Postfix) with ESMTPSA id 0345AE0004 for <62075-done@debbugs.gnu.org>; Fri, 10 Mar 2023 20:20:58 +0000 (UTC) From: Nicolas Goaziou To: 62075-done@debbugs.gnu.org Subject: Re: [bug#62075] [PATCH 1/2] gnu: cataclysm-dda: Improve package style. References: <20230309123047.70497-1-mail@nicolasgoaziou.fr> Date: Fri, 10 Mar 2023 21:20:50 +0100 In-Reply-To: <20230309123047.70497-1-mail@nicolasgoaziou.fr> (Nicolas Goaziou's message of "Thu, 9 Mar 2023 13:30:46 +0100") Message-ID: <87a60k73z1.fsf@nicolasgoaziou.fr> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: 62075-done X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: debbugs-submit-bounces@debbugs.gnu.org Sender: "Debbugs-submit" X-Spam-Score: -1.7 (-) Nicolas Goaziou writes: > * gnu/packages/games.scm (cataclysm-dda)[arguments]: Use G-expressions. > [native-inputs]: Remove labels. Re-order alphabetically. Applied. Closing. From unknown Fri Aug 15 20:51:33 2025 Received: (at fakecontrol) by fakecontrolmessage; To: internal_control@debbugs.gnu.org From: Debbugs Internal Request Subject: Internal Control Message-Id: bug archived. Date: Sat, 08 Apr 2023 11:24:10 +0000 User-Agent: Fakemail v42.6.9 # This is a fake control message. # # The action: # bug archived. thanks # This fakemail brought to you by your local debbugs # administrator