From patchwork Wed Apr 19 19:53:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ivana Drazovic X-Patchwork-Id: 49305 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 DA04017ABB; Wed, 19 Apr 2023 20:59:32 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,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 79E8917AB6 for ; Wed, 19 Apr 2023 20:59:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppDxM-0003pf-41; Wed, 19 Apr 2023 15:59:08 -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 1ppDxK-0003om-AA for guix-patches@gnu.org; Wed, 19 Apr 2023 15:59:06 -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 1ppDxI-0004xV-6C for guix-patches@gnu.org; Wed, 19 Apr 2023 15:59:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppDxI-00077g-1f for guix-patches@gnu.org; Wed, 19 Apr 2023 15:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62902] [PATCH 1/3] gnu: laby: Use new package style. References: In-Reply-To: Resent-From: Ivana Drazovic Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 19 Apr 2023 19:59:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 62902 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 62902@debbugs.gnu.org Cc: Ivana Drazovic , Florian Pelz Received: via spool by 62902-submit@debbugs.gnu.org id=B62902.168193433327314 (code B ref 62902); Wed, 19 Apr 2023 19:59:04 +0000 Received: (at 62902) by debbugs.gnu.org; 19 Apr 2023 19:58:53 +0000 Received: from localhost ([127.0.0.1]:35927 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppDx7-00076O-Aw for submit@debbugs.gnu.org; Wed, 19 Apr 2023 15:58:53 -0400 Received: from mail-vi1eur04olkn2082.outbound.protection.outlook.com ([40.92.75.82]:42148 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppDt2-0006vR-EN for 62902@debbugs.gnu.org; Wed, 19 Apr 2023 15:54:44 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ffJVWst3gXZS74UwuUdWodnbrqSDyY44anHVXr7qpdbe4cM1T6yCQ0ZCxnEmOYHh53YNyMGT7E1FMFUCQC518aC2d0NGT2xVwGadYpuvTkSnC5sPiW4tYtUfBlmZys9iEq39mgZlPc6iOjPBNydU85/WG+ItoiM6BFZkMtTpXNMMm4EEvy2sL/8b4qeuUGY9RGAEDXq2AytVEdZT1DfRHMcAqMnI9EcYzrVAskbt5ylU4hzTTvR9S09pmdfZooFflSKAtLM8iglMeKEQ/vzLXwFHxv7lg0OYl3ufxA6tyEWVewQvJmpLNg00A38uFKmicqEMqbzqiFJ4FnV7uNLvBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=I8WKrb8gDRrxy7MlFUJ0FpdVUZeTukoVrWXGU7mzPkU=; b=ekrSB0WKyeh+6c55Y4XhjHyY/Vls3KwsN7n0V/4uje9WZTC7Nnmf5PKnZh0AAx5M7vLbZpphutbOIyQs2kTYMTgD2h60J6jzl+GjNOzPyhDhnXrHR3xtgUSVsQJ3Uwj0tKXs8oHywiJHZHNXTdN43lysCk/M4+VGUf7N4w1SNdUTiDmQqBs+K7JsiDFynAa0GgIFQkD9CXtUjZyW4YALssdydRtM6V87E7RzrGlOYbLXxdWpHhUX7+yOi2TCI5eehdRzC9mN8u9YDQVpAWO7rj40btC+Za9uNzZPYvpmRCnVwGnR7k/qdo1KC07dDpcEPqyPcxEQICw5sy99Ur2EsA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hotmail.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=I8WKrb8gDRrxy7MlFUJ0FpdVUZeTukoVrWXGU7mzPkU=; b=US7mme6MyzAs+WfNUUeArx5etLtd8J37NQXmxHDH30+UB3tyTfDwErBepMn2cTXW47/H2Qc2iInthnljP/JoCWYWoTsPoVfRLBPJaCY/ySNyILiy5csPrQQ+ob7pB/DtzfLT2aQ4Eu5+aA9bh3YuPVxvOcmhppro7brntMgAdiSn1Y9RMFwKBew1XWib9owmVvC9v27W14gUJO5ik/OoT4hcNbv0QP2WN/5y1mF9N+lW0G/vznvCzrE2GaoH2HojwD98X/NAu1G86LxMdqff7+QLJWuYjbWcGKBRYgUVawC+kmPNmLp5eAjgVktiTCWOHTYvkb4IZiujaHm7f9VXeA== Received: from GV2PR03MB9449.eurprd03.prod.outlook.com (2603:10a6:150:d7::15) by DU2PR03MB10066.eurprd03.prod.outlook.com (2603:10a6:10:49d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.30; Wed, 19 Apr 2023 19:54:33 +0000 Received: from GV2PR03MB9449.eurprd03.prod.outlook.com ([fe80::806e:b02d:d2e5:fcc9]) by GV2PR03MB9449.eurprd03.prod.outlook.com ([fe80::806e:b02d:d2e5:fcc9%6]) with mapi id 15.20.6298.045; Wed, 19 Apr 2023 19:54:32 +0000 From: Ivana Drazovic Date: Wed, 19 Apr 2023 21:53:54 +0200 Message-ID: X-Mailer: git-send-email 2.39.2 X-TMN: [pZ7Px1fECaHK4q1fMrBdjvMdWEXwUMBh] X-ClientProxiedBy: FR2P281CA0002.DEUP281.PROD.OUTLOOK.COM (2603:10a6:d10:a::12) To GV2PR03MB9449.eurprd03.prod.outlook.com (2603:10a6:150:d7::15) X-Microsoft-Original-Message-ID: <20230419195356.2418-1-iv.dra@hotmail.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: GV2PR03MB9449:EE_|DU2PR03MB10066:EE_ X-MS-Office365-Filtering-Correlation-Id: 10a2d5e2-83df-4434-1cd7-08db410fe50e X-MS-Exchange-SLBlob-MailProps: mWtqiNqNgRsQTi6fZvg0W+ElnNz0swY+esRIegeil5VJyTCWIR8Ln3EluCKLOE08U3KJ1lvmQ7c6RFmo7YKTfusIpRiCXnIzj9qGPW26sXQi0AKrtiDp11whN5BUommNDJ5IM9wHp3yLjNMkHR1CMxCmBaAnFfx19RLEE6zW/OX31hz8T+zF+vhK/fes5xoWGIMVXkCIDIRwbqF5C/S495hHPyj/FRRFd2OSpn89H4UY79p/MlevR/MrQN2nqzd4AK15pJG5DU1F1c16c+0q8++3C6pzljoKSn2Q+VxJZPLy7wRyd5rIqGfUPuBr+IuPNZQguxLWfoa61gbOnmETYv6GueBrtFt8yimwbcOj4tqa9SKPCi27JUEFRvXv61+HWLwqbJKfjlDQoWU2k9prNEvEF3rVF1SSPdaJ+RR3h8DaUbEz8jGsyA/d4mIbreHrUNGyZDvmSfapAGDX4a2DcUGAllhm+VfNZVfyoJh/Cc5uDyDjnDHB2kHgQpLmkMDqHH9se2anRyCWb4XxQDCVhFnR79gaijc2lCWrhkxUL3RpA09vVJMGFByfpi1reC8kY48pvW0fcD3SAUZZ8jhB3TnQf3Q8oX9swz2GdIaCpMz3tMOgypZPTv8K4RxpdSNZGLzwl4wBq/0fAFq5+aIC39l41zao9QBY1nxS1dvzoIjiIe/LIYDiDZ/utCiq/v1mvJcDKP5mXffkD0vAE5CFfFtqlwKVoMaOgIV+2nVzAfW7nzA91a0T9mmCW2hpIUagazjouGxg9sL5ugsZslGPtr9bsb6zRcyHhCDoOkPj6XQ= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: actr3MFDlU++EM8a17V/QogQLG/QHXUYccCx7NHBMesgpAXYiE9n5PrNf4PE5oTWsl3IvqTdGFCrY150aUNGA6oTUxDXnvqTtGZKQwJBCBG/4NbVYo7c1wRE0mm06vjxiCYLXLDGFouDCa8xqJl904UBtcEHK4BfFW95JEaX85qr4MKqLLt1ITU3jogqdxOPuVUWMR0uNt/GVBmmXAh1H+Xx3Yba2ZGl88dusR0yAlB64l4jbl+AgdqbOnPPMrN0Q7WHSeP2DpYtuHgysNQrrRCPOvKu7jgj2NqPMYZD6JOho1VZ6rYZCKXVUCnNg26tavMgJwcNZepWPXyBzPTQ6B5KEVhJ1ZZoepTYblMo4qpba2PSrh7FObppD9E6QrXpKnndSl3zC2cf+vtXgA5V78X+RpGPH15+CGE7yP5iBfFIJ1Ebt6Y3xQbHjVFK3iXNXSzh5Db+GXLgMpLXs/op4QDkw6Xnj2vgEhDTHaVVyE0SqwBJothdWXbC6IV2+0FiNtzhsV8mXtuaffF2RW4vH1O9gCTQj2FyJHi9pj5jVYcP/NuccGzMizV35TSdcc7e X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: aF4jh+RKv6DDWWeJT3luLY4m9HC8K4mdEZLjmb15vIg+hSFk/jP80exRrIKI1V2vlrnF9aQWySEZMkZz6GeOPLcPCRVUKgCHbx9yIcksQ2tY5JlPzvPVGGWRA+Q6r7pUWxYrpFiG6BdOSJ+Iawozs3IAqHj5v920qre67NsNL8fUo9eXvLj2DW8CqNWQ5u35RKvLbcKSCEtdTBrHbNKrwQTG1qbBsfSdqe1NIqhhIJ7fKd6qDmsPdkc3YRta8eOLAvBZW5sUFUSplXeRVz2MjcL4+djKvLT0Mjas8U6Rb9W2ZryJGQerMY3zWu2MeXX2q2mpMSozysl0Vllb+p73+R5J94inL21uJ/bvl6n12rE4WeKv2kXoFJ/TGDgDRsUVX8xqjs7cbVHDqsAgZJwfrJw7ycL4EXDr858IiVM331GrXr5VIt/DAZS8yIZbMSTMY+ZT6NBaApHhtc2gsYBWkhmHX0UC8pscAHAe6Tht6GnS1z7jLBaBwrM7cNRI4OKrb8gRXm4cQOfyhkX7PtyVz5j+HkPkOyz4iRN9sLSMv4xe3MTHOegDHLoa40Ls13vpbVkuu349d7P9lt9Z9Rf672kYhXmoLDbxXMpSYYKdvCeNHyiW+1Fcy0M3kLxF5tBmTEPUa+veoNx2ya9vnhX8pmSjc1IIYNBF3c2jXi3yd+J1dJghHfDb7kBfnHZ/XFtJjv6JkztOw4nMDNGCEQBmxrsZ1TLL75VUsHGTCs2l6/ySr11e3wUls7nC35s1dOoy5kt2C3gCGxpOhTRcVPXeQP61V+K5sG+bYWkQgCLEieePMJApwwiQEPy2i4Nro+39PdtnLX2GqpsfQDnkTH84fn7HUz8uy0ODrRE8TND9TIKOm6M9JiPx//2OQHSqSPIQeSqmg86iTTH9neXbEgMuvduzwwBFd3oF9sCcrOgx0AVaIhuYuPePC8+DOmESdcqVzyp0rW01bJO91DuEHXvYKZdvvjBmt0JcU3xxxXRr0vL6wD5EJskgMJNT8cG0rl3lCvW8hEzQ4RynjOWS5o75mUjOYEQR01JR9kfcMYSs92pLzxk/8hPBojitmkiK+Gi7MFD4NI5xuLkO6vNBwFkfxi7UQunpLE4IKxMxgBzGeWy3cEjbRFd4bF/z+Xtv2ytm2fpl7RGpw5Fu2PxXorE3kCsinDk3eZpgU7brIHNa803WL8xYZMUHiIilOGD7+e+W0P7l74ffZf9Th3WRINu3SA== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: 10a2d5e2-83df-4434-1cd7-08db410fe50e X-MS-Exchange-CrossTenant-AuthSource: GV2PR03MB9449.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Apr 2023 19:54:32.8664 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2PR03MB10066 X-Mailman-Approved-At: Wed, 19 Apr 2023 15:58:49 -0400 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+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 (laby)[arguments]: Use gexps. Use "this-package-input" to locate package input. Co-authored-by: Florian Pelz --- gnu/packages/games.scm | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 5825b8d936..6a404d7712 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -75,6 +75,8 @@ ;;; Copyright © 2022 Maxim Cournoyer ;;; Copyright © 2022 Hendursaga ;;; Copyright © 2022 Parnikkapore +;;; Copyright © 2023 Florian Pelz +;;; Copyright © 2023 Ivana Drazovic ;;; ;;; This file is part of GNU Guix. ;;; @@ -5777,17 +5779,17 @@ (define-public laby (inputs (list lablgtk3 ocaml-lablgtk3-sourceview3 ocaml ocaml-findlib ocamlbuild)) (arguments - '(#:phases - (modify-phases %standard-phases - (delete 'configure) - (add-before 'build 'set-library-path - (lambda* (#:key inputs #:allow-other-keys) - (let ((lablgtk (assoc-ref inputs "lablgtk"))) - (setenv "LD_LIBRARY_PATH" - (string-append lablgtk "/lib/ocaml/stublibs")))))) - #:tests? #f ; no 'check' target - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out")) "all"))) + (list #:phases + #~(modify-phases %standard-phases + (delete 'configure) + (add-before 'build 'set-library-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((lablgtk #$(this-package-input "lablgtk"))) + (setenv "LD_LIBRARY_PATH" + (string-append lablgtk "/lib/ocaml/stublibs")))))) + #:tests? #f ; no 'check' target + #:make-flags + #~(list (string-append "PREFIX=" #$output) "all"))) (home-page "https://sgimenez.github.io/laby/") (synopsis "Programming game") (description "Learn programming, playing with ants and spider webs ;-)