From patchwork Mon Oct 31 09:39:28 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 44215 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 9CAC127BBE9; Mon, 31 Oct 2022 09:40:16 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,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 3FCF227BBEA for ; Mon, 31 Oct 2022 09:40:15 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opRH5-0005PZ-11; Mon, 31 Oct 2022 05:40:07 -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 1opRH2-0005ON-EX for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:05 -0400 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 1opRH1-0001as-Dx for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opRH1-00049p-90 for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58920] [PATCH 1/2] build-system/scons: Allow using a G-exp for scons-flags. References: <20221031093659.20182-1-timotej.lazar@araneo.si> In-Reply-To: <20221031093659.20182-1-timotej.lazar@araneo.si> Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Oct 2022 09:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58920@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 58920-submit@debbugs.gnu.org id=B58920.166720917015892 (code B ref 58920); Mon, 31 Oct 2022 09:40:03 +0000 Received: (at 58920) by debbugs.gnu.org; 31 Oct 2022 09:39:30 +0000 Received: from localhost ([127.0.0.1]:39558 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opRGU-00048G-0U for submit@debbugs.gnu.org; Mon, 31 Oct 2022 05:39:30 -0400 Received: from araneo.si ([90.157.193.204]:40044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opRGS-000487-1r for 58920@debbugs.gnu.org; Mon, 31 Oct 2022 05:39:28 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id 38f9b659 for <58920@debbugs.gnu.org>; Mon, 31 Oct 2022 09:39:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:mime-version:content-transfer-encoding; s=20180623; bh=Cla5ZTYglis2etuivuF+n8Urcus=; b=sB4P9BZGmnVmpoOQ J6HGjqbwHzzhWJ+ecL6z7xkfqO5e71O/IZRrP8He4NqQH7v21YIje2wshkDgR8kS HsjWExTyHNfGsF7N4vsvBXLJQdWjCES11DXvNrcvZx/YW5CVxkAxZqARo9x7fhlu TmNUTpuEUO3QAQb99FraB7a3cxprBrG2UECKONAaJwXOLiI2PJOUr2a9TGt7BR0n CS8jpN61oZWKAfLtZc71gr0kEAgLhgdFuQTm5yx2cyathscZm5OMAUx6s2GojPeS dauDOFKM/FBbuYr8WAzEwJn3EigokloZXdcf+pctMS+dKolVmfTSJ2aQfkSmbV4o brlMNg== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 79eb76c2 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Oct 2022 09:39:26 +0000 (UTC) From: Timotej Lazar Date: Mon, 31 Oct 2022 10:39:28 +0100 Message-Id: <20221031093929.23368-1-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.38.0 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build-system/scons.scm (scons-build): Only call sexp->gexp on scons-flags when scons-flags is a pair. --- guix/build-system/scons.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/guix/build-system/scons.scm b/guix/build-system/scons.scm index e38213e8e0..7a02fa8a0f 100644 --- a/guix/build-system/scons.scm +++ b/guix/build-system/scons.scm @@ -100,7 +100,9 @@ (define builder #$(with-build-variables inputs outputs #~(scons-build #:name #$name #:source #+source - #:scons-flags #$(sexp->gexp scons-flags) + #:scons-flags #$(if (pair? scons-flags) + (sexp->gexp scons-flags) + scons-flags) #:system #$system #:build-targets #$build-targets #:test-target #$test-target From patchwork Mon Oct 31 09:39:29 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timotej Lazar X-Patchwork-Id: 44216 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 3611827BBEA; Mon, 31 Oct 2022 09:40:29 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 BAB8F27BBE9 for ; Mon, 31 Oct 2022 09:40:28 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1opRH4-0005Oj-9d; Mon, 31 Oct 2022 05:40:06 -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 1opRH2-0005OO-7m for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:04 -0400 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 1opRH1-0001bg-Qc for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1opRH1-00049w-L4 for guix-patches@gnu.org; Mon, 31 Oct 2022 05:40:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#58920] [PATCH 2/2] gnu: endless-sky: Update to 0.9.16.1, use new package style. Resent-From: Timotej Lazar Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 31 Oct 2022 09:40:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 58920 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 58920@debbugs.gnu.org Cc: Timotej Lazar Received: via spool by 58920-submit@debbugs.gnu.org id=B58920.166720917715923 (code B ref 58920); Mon, 31 Oct 2022 09:40:03 +0000 Received: (at 58920) by debbugs.gnu.org; 31 Oct 2022 09:39:37 +0000 Received: from localhost ([127.0.0.1]:39566 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opRGa-00048g-Lo for submit@debbugs.gnu.org; Mon, 31 Oct 2022 05:39:37 -0400 Received: from araneo.si ([90.157.193.204]:40044) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1opRGW-000487-Rv for 58920@debbugs.gnu.org; Mon, 31 Oct 2022 05:39:33 -0400 Received: from araneo.si (localhost.lan [127.0.0.1]) by araneo.si (OpenSMTPD) with ESMTP id c7a956c6 for <58920@debbugs.gnu.org>; Mon, 31 Oct 2022 09:39:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=araneo.si; h=from:to:cc :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=20180623; bh=iFs51fX2DIdeDn1rnl+Lh K69YZY=; b=Pk9TLtPCPTbrUgeZ6oYRIa3iyE6ngYlzdxwVBl22gO71j389seXSO PcjxP1LJA8Ysp2TS4u9aQU6DXFBaumi7PaJVbYQX1m0h5Xb5vaTW3H8W7cIARC2M UtSiFN9dPvdIUlSwWtm9QIDFfa9ALI7PntTFiDSpZJjYYhWK2GZe4fmTNTosWz+a bjry78wOuWSNNwJ/HN1akw5EbnuPn4gOAT5ohvUd1WOvMSIccEvR7YepVBQEsj77 jwFlutKTU7FMUFESBuN2MgcbXslgIOyymPgXGatksvr6m3VDVS2TS9LgmJM6veow ArKTZUuLWOgMy9hyx5Jmf42jgZlnNMzsw== Received: by araneo.si (OpenSMTPD) with ESMTPSA id 84248d06 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Mon, 31 Oct 2022 09:39:30 +0000 (UTC) From: Timotej Lazar Date: Mon, 31 Oct 2022 10:39:29 +0100 Message-Id: <20221031093929.23368-2-timotej.lazar@araneo.si> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221031093929.23368-1-timotej.lazar@araneo.si> References: <20221031093929.23368-1-timotej.lazar@araneo.si> 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: , Sender: "Guix-patches" Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/games.scm (endless-sky): Update to 0.9.16.1. [arguments]: Use G-expressions. Drop #:scons to use the default version. [inputs]: Remove labels. Add util-linux:lib. --- gnu/packages/games.scm | 46 +++++++++++++++++++++--------------------- 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 56d4ad2d87..a04cb0462d 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -8275,7 +8275,7 @@ (define-public quadrapassel (define-public endless-sky (package (name "endless-sky") - (version "0.9.14") + (version "0.9.16.1") (source (origin (method git-fetch) @@ -8284,31 +8284,31 @@ (define-public endless-sky (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "12iganf8dxiyrjznnabsarxjsr0h717j3k4mz15p0k67wxyahhmf")))) + (base32 "0cb2g1cb0mk6x9gq2x7n10rxlfhsq8wnssk068j6h80al3hhybly")))) (build-system scons-build-system) (arguments - `(#:scons ,scons-python2 - #:scons-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key outputs #:allow-other-keys) - ;; Look for resources in the store directory. - (substitute* "source/Files.cpp" - (("/usr/local") (assoc-ref outputs "out"))) - ;; Install game binary into %out/bin. - (substitute* "SConstruct" - (("games\"") "bin\"")))) - (add-before 'build 'use-gcc-ar - ;; Use gcc-ar to support LTO. - (lambda _ (setenv "AR" "gcc-ar")))))) + (list #:scons-flags #~(list (string-append "PREFIX=" #$output)) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda _ + ;; Look for resources in the store directory. + (substitute* "source/Files.cpp" + (("/usr/local") #$output)) + ;; Install game binary into %out/bin. + (substitute* "SConstruct" + (("games\"") "bin\"")))) + (add-before 'build 'use-gcc-ar + ;; Use gcc-ar to support LTO. + (lambda _ (setenv "AR" "gcc-ar")))))) (inputs - `(("glew" ,glew) - ("libjpeg" ,libjpeg-turbo) - ("libmad" ,libmad) - ("libpng" ,libpng) - ("openal" ,openal) - ("sdl2" ,sdl2))) + (list glew + libjpeg-turbo + libmad + libpng + openal + sdl2 + `(,util-linux "lib"))) ; for libuuid (home-page "https://endless-sky.github.io/") (synopsis "2D space trading and combat game") (description "Endless Sky is a 2D space trading and combat game. Explore