From patchwork Wed Apr 19 19:53:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivana Drazovic X-Patchwork-Id: 49306 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 B1F4817AB6; Wed, 19 Apr 2023 20:59:33 +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 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 4CEFF17A9A for ; Wed, 19 Apr 2023 20:59:31 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppDxL-0003pW-Cb; Wed, 19 Apr 2023 15:59: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 1ppDxK-0003oo-9j 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-0004xX-LW 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-00077p-Gv for guix-patches@gnu.org; Wed, 19 Apr 2023 15:59:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#62902] [PATCH 2/3] gnu: laby: Make laby function in pure environments. 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.168193433427322 (code B ref 62902); Wed, 19 Apr 2023 19:59:04 +0000 Received: (at 62902) by debbugs.gnu.org; 19 Apr 2023 19:58:54 +0000 Received: from localhost ([127.0.0.1]:35929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppDx7-00076V-No for submit@debbugs.gnu.org; Wed, 19 Apr 2023 15:58:54 -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 1ppDt6-0006vR-FP for 62902@debbugs.gnu.org; Wed, 19 Apr 2023 15:54:47 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JhtLS2nzdrf6dt8ikiPqDkKf2bX8D2EhEvLUZaw+JhHMGrIlch0f/xRgsgM7KxXYAtPVGRttzC03cjWy+332sSz6QwOuH2Q83yIqj3CzczGsUPztaFcN/Lk9KS2c3EFSKyM1IWdBILBXbYavbFU7KfcO/Ugmmeh41m85/yxWvKILY+HK4lWz/5qK5viIYGCxvu7Cw/IR4P8LmoMAwJZ0Xj+2mrUVZbhPNBGkRhRHT0Zi6NQotPNKaghrCV+BJZybqzEGn3nw743OHGxNeB9XimbkVoKJMsiCQSomtNFaSVrBsY/XgRYSpAHgY0wSzJU58mmiHqm/u+eG/t2SpYzKFQ== 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=ndl6GvGVqsqBi2wqS7eJwjwVeABfqi7V4hMh0zXbG44=; b=hVb+rCbJJccehy1MEPZaj2Enyja6NDn0aYZLL/DtdyqeuUrwOHFE5wSewP/hoN5ftn48PCPjC9qJum8jIZi4J5n2B8Qo8FTBnq7Gw50FZsylXj861zoWQXGC+WZB13DkvEpNj17b4Dd1omDsPnE6MV2/aaYObPXf9TlcirudODPMA4gDou9nhyYdg0ZJkZuvnQ0xOXFgH0GFdtAN/GBqaTN7Ct+gp5NEy0DLIpHsTbcwgnsNZu//IVLA/+j8d3adoGote1fc15Z6zGSE1HKzAfQOdaxn8+G3oNVF2JCxS/4X6zihT+ymeDOs0VoNTUUGS/0h6az9XFZiP/f62z/LFw== 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=ndl6GvGVqsqBi2wqS7eJwjwVeABfqi7V4hMh0zXbG44=; b=HOBIrQiIutLnLUISAwmvjH/HwYfzqD/jsTc3qWB0ku2EaYB7u/asQRUDatDarcnNU3aFyIE8Qb34Ar52iqFovQf+y54P6opapUvP/pq0F5kz12UqALcyhji1H16YXOozJk+I/MpIW2sYPqVC3+ULworDsN9G7EFcnleXKKF4z965GZjzBq1vDrZwLIENgWW3HFjyvnKTrkv12RkIWriEY4WgxqSXiGfFcQwcVn8OCAY5HIm0bQ1GQxYKXsRX6CqX5uaf9/Cq6wjPtfiNPUTiWJ4FfXIAoH+whuVU6wXjtysf7jluOCZ6wMQ4rdhbjisa8rHgOmnnyblDQF5ghs1xpA== 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:36 +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:36 +0000 From: Ivana Drazovic Date: Wed, 19 Apr 2023 21:53:55 +0200 Message-ID: X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230419195356.2418-1-iv.dra@hotmail.com> References: <20230419195356.2418-1-iv.dra@hotmail.com> X-TMN: [VzYVpJ/QzrAV2+Sk8CVBuWB4iTF21DCF] 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-2-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: bbb12122-b425-4fdd-7d4e-08db410fe74c X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKx/5wRYKwbtF7hqq2E99L18JUFRneVsuTdtH5TOW6kXgPqjnMhv3UFzna2BveffUYBPoG0LTe/iYR51SJyQDrsLV5o6cPBa/wXH+HLFArlSqRo5vQkn+fbm1wLBGYmoYMvOoAlaKzDpZlmP8WR00wrTFfxUZ4YaTSRtz13+CD50sL2MFqf6FDiEb049qooZqxm+Qnxe3AGeG4C2fJvBUIGHU58zNjigL5De6ax0OVUR01Wjf9riW07XsRWExHfm0RcNszDgtEmH2iNYK0KGzqv1ITZsXpW4WEhO5LoZy9HCWzPzuh9ZF4g3kqJ18vAjmCeds85IMF2i34Grg2GeSqJ6awbDiUx+5CHfgM24qHkN2UEqvw5koz/cCtW9mtKZUhD14eksR93tVe2PTWKmFrpY/1NCoBSr3oNHHVjbK7DmvmBGQAo3Pkk7ZbmCPlQWQectfDuNxfPyEa5cGfVrag5Haqw1Yr98ux1tKwkZeoGDHG0c/NO09jZwEO08qcJMI7H7rmQC6Q2P6dQR2/4BnEyXkaFXBlUtLB51N06dJuqQmtaZHdjxa5XaCOhpXiUOkkDI12eq3L1C6H93rrs7W/KJwmk6uk2ASFFTZUDtNRI6JlE5+rpdRRd3hPzCdZncYKriFnDj9Q5FTxNubxKnW2teYFw1R1mIX7pCnClGw+SoIvHIwsHbEQwD9kKBUoaK/0vonKwajkT5HZ4UnYhEktXUaEygToB6jkU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6W9J/T19prdPFKB2KDU9+kjEPCerVoPYjTeucdHm1hIiND1+y8XMuU55s34Fatvn3fOvH2s0iaESxbMNecr4IWs2Q2NnGwFgoWt4NILn2+FvbxjBD1rZ9RqglzMz3kIx97xLoK+6Qfa6RZ5uRk8BIbvX1ZKtJUl+Xg1TTAw4lU5B0NoU4Yul8IZjIL/JF5BMHNpy2vRTGz4mhlQPBywIBeWLrIerj+MJFJ3BAOQODtyvLwYKzCZbGrribHEc6yTMcfjyf9LdPch73UTKiZUz5Cqu7FaoC5ci0DW5d85PIhB+4IxdPH8LVyDkr+DDAQVN7wbKQG94Znq5tluWZTQAnOb3dquD9670VoKnOomY2wmslonw6odE9+GpI4Q0SGqhxYmr/6PS+3C85oWHV/A4QguqCADCP7xpIYDyQKvz0vVMYiwTdroxSs4yE3qrDSWjI8M3MCWFfL0d4GkRTNn1GW4HYFvFiS9t2SXFt/Pspg3XjSq4y/bfcPaiE4ZjmqVtFz3DNmNlLw4RJ4828T0urWLdBgFB5LByRFTHem3Q9KMD8leFaj7Cf0WsOQv2UjG0+EDZ8SMGEQu/xnleaOskk20X9f+3Ja9Zvxp/TsfpKc5jve/i0fjnTxjHcIRXnw7b X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: nbrLRcjYio9l0sX5/5zrVs7lvtpWhZZCtzUJIxS8XPRP7BslzDUL0ONh0HiCc9HmkXoEG2oY/cwXha5vlhFv5dbMGn2YkOtS6wCJXZlsdxncia18Jx8PZ0U+VucoluQLxBAL5gSDtDTL1Ug73P8Ki8xDiKWLpx62aU2tmJHJTP1sUjiJOmrHrwVFvxIWAmvUnAXZbZ4kqs2QkSAEIeiFD+GVK0qt7/XK2fAguzZwnpFPAgEOr1k7LvA/g8Inn5IojjsR9wWGPCJgTBb49UETiR7IpVr4AvWhDC1R/Nxmo+uGoLB5CErFOkq7MjEJPrik/eZYjQELySGQQ9se/77Ml6aevrVWHpF7VrYn6/Lu9PazZS+PH5TRmPuRZB5WI8/SxynIQlOHSpiMMrlaq6UOlufKNhKIOehpac17enqLg2Vkqr4RhUfxB/gtrJR7mlbJBDctZr0TEmPi5CufX3gVC/rsFxiufjro1gxLe+rZYfyB7jX362ph52WplIWeCXasij1aOmv123RPRchuO//o8PPS+PAEMxU4IkhFLAHSeaYUm7VkoK8GKRYbFl+yIQR9RCQ9fUtFdMhILm+CxSXgHsazYDBH5Ju3KAWudnHtgkby0MdwP1dKw4kMZiVciE5gx0GgjBPiiPonWJaX6MhNLUL9SOBbapHAbR50S2bDYVj2gkgqs9Z4qK/Z2i6cEhrNRPYecxTSl4ARVixnHgb5rOae4twWG7ofVWyd9haB0piR084pDlohogkqx7Tyee6EXaTdgdSrf/7sh6bxxOlhXwFruND1kj/tgKPqczxzb/bk6MNLFqV0sJAM1UAbWkeQSljwcdZzJT8hjgHfc+hdY5WYbNAW/j2uJjd9BScgcyT3dOXtH++QKQ7eUGz0poeKPvcvFLrjMcP13U6U9oh6pE3RZ9rK4NY+WdhDhenLB53OvcPOoItXA6cwlnSxLTi2xemPdr+YvCzU7fDI/D3mmqAfn107EIlqxdL+Ywxdhm5vtdOAAT8t0rJb7NMppEthQp544IvVNCJYF22kJhJJ9kAwTF1FrANPHzgneLYT1brtVLLMsr6BqXbqBj84rLE9Q6NoFLaib6gLld8V83GSlqUnCaPL3+BSMiTU7F1NKiBdwHStqj3q9dAAYpg/NHtU3Mv82T5iMHdr8Gte79Oe4o/zpnZRP0Ae5szOWomuOMewshjFV0N4JZHwU3Evvapbu4fxqDVCWPML0eCMtpHLmw== X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-76d7b.templateTenant X-MS-Exchange-CrossTenant-Network-Message-Id: bbb12122-b425-4fdd-7d4e-08db410fe74c 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:36.5249 (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) [build-system]: Switch to 'glib-or-gtk-build-system'. [inputs]: Add 'gdk-pixbuf' and 'librsvg-for-system'. [arguments]: Wrap to use SVG-enabled pixbuf loaders.cache. Co-authored-by: Florian Pelz --- gnu/packages/games.scm | 21 ++++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index 6a404d7712..ed06a57636 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -218,6 +218,7 @@ (define-module (gnu packages games) #:use-module (gnu packages xml) #:use-module (guix build-system copy) #:use-module (guix build-system cmake) + #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) #:use-module (guix build-system go) #:use-module (guix build-system meson) @@ -5775,9 +5776,15 @@ (define-public laby (base32 "1y6nfxcjhqg9bb81hs0wijg7kcwk5kff81rgd8bsv5ps7ia9nj6b")) (patches (search-patches "laby-make-install.patch")))) - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) (inputs - (list lablgtk3 ocaml-lablgtk3-sourceview3 ocaml ocaml-findlib ocamlbuild)) + (list gdk-pixbuf + lablgtk3 + (librsvg-for-system) + ocaml-lablgtk3-sourceview3 + ocaml + ocaml-findlib + ocamlbuild)) (arguments (list #:phases #~(modify-phases %standard-phases @@ -5786,7 +5793,15 @@ (define-public laby (lambda* (#:key inputs #:allow-other-keys) (let ((lablgtk #$(this-package-input "lablgtk"))) (setenv "LD_LIBRARY_PATH" - (string-append lablgtk "/lib/ocaml/stublibs")))))) + (string-append lablgtk "/lib/ocaml/stublibs"))))) + (add-after 'glib-or-gtk-wrap 'wrap-pixbuf + (lambda* (#:key outputs #:allow-other-keys) + (let ((laby (string-append #$output "/bin/laby"))) + (wrap-program laby + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows laby to + ;; function in pure environments. + `("GDK_PIXBUF_MODULE_FILE" = + (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))) #:tests? #f ; no 'check' target #:make-flags #~(list (string-append "PREFIX=" #$output) "all")))