From patchwork Wed Apr 14 03:53:12 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Hass, Trevor Stenten" X-Patchwork-Id: 28487 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 3E19E27BC74; Wed, 14 Apr 2021 05:09:09 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, HTML_MESSAGE,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL, SPF_HELO_PASS,T_DKIM_INVALID,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 5B73A27BC73 for ; Wed, 14 Apr 2021 05:09:08 +0100 (BST) Received: from localhost ([::1]:43308 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWWpv-00049Y-Hy for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 00:09:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWWpq-00049Q-AG for guix-patches@gnu.org; Wed, 14 Apr 2021 00:09:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:49798) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWWpq-0005CK-3J for guix-patches@gnu.org; Wed, 14 Apr 2021 00:09:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWWpp-0007bi-UV for guix-patches@gnu.org; Wed, 14 Apr 2021 00:09:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47765] [PATCH] gnu: minetest: Fix absolute path to 'rm' command. Resent-From: "Hass, Trevor Stenten" Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 04:09:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 47765 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47765@debbugs.gnu.org X-Debbugs-Original-To: "guix-patches@gnu.org" Received: via spool by submit@debbugs.gnu.org id=B.161837330929202 (code B ref -1); Wed, 14 Apr 2021 04:09:01 +0000 Received: (at submit) by debbugs.gnu.org; 14 Apr 2021 04:08:29 +0000 Received: from localhost ([127.0.0.1]:33111 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWWpE-0007as-Cw for submit@debbugs.gnu.org; Wed, 14 Apr 2021 00:08:29 -0400 Received: from lists.gnu.org ([209.51.188.17]:44920) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWWpC-0007aj-6u for submit@debbugs.gnu.org; Wed, 14 Apr 2021 00:08:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59558) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWWpB-00047P-UK for guix-patches@gnu.org; Wed, 14 Apr 2021 00:08:22 -0400 Received: from mail-eopbgr760040.outbound.protection.outlook.com ([40.107.76.40]:19171 helo=NAM02-CY1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWWp9-0004kP-O6 for guix-patches@gnu.org; Wed, 14 Apr 2021 00:08:21 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=FchrmeweHj2Nnj17fPdhNxRliLXF+5peB3lk5xFPhcy6CRvMaxJ2YH2EqamAA9zmnVecsGnKw3grze4rVBPyNrGVsVIa9s2ejzeaYbWAB/I2N+OlzkINREwbEM6epXOhbD4U7SskuYYGKEXf1F620fZir37W/FEh24HiNc6VQYLbOvgV+bamYPdsTpwQbJrHIJZCnFr45x024QjoDyTlHCe+D6Y5bgxRojL86J1HowXljbf5QFi0ndfv0KyFu16is5vCuzdLFZM3ybRgtAT1Rexq9jFuFyDPCqgiMqwulYBxi8VlEGGMf6xQc90vMsNLNpHi8f3KPjy8OcRuUZLbPQ== 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-SenderADCheck; bh=8LAd9HrROldFWOEAIFLzgWAxhCi7whWQyXfT735gVQg=; b=CVGU+iSxotdGbeBZ+0/w+TwoKkP8ZQDM9EEqNSn/LlXQ7U80MqXSa6ILWFgptEz0E9A8G0v2wD0K7DuRKKGH1WwQvh3whUMYj6fVUbJJtV3l2fLwraD7MoI4g0bQAgx2D+2SoTAyWG6sQ8ev93GRtnQUhlSoxXFZkaaUul/3MfXeqnVEKIl9Ekd9KGlWALBQKMCjT+Se2IDmGWhFtj/Z4Bu4Nrquhxv1kR9sNYA9Yonm3pQmoGun7PgQB4zrHFGn7xON736tY1wNnUyR72Koe023l0SIVnN6BhKuneiCn+0cz78/Bxg560QLViHchhXByiDgWKjwfUwqiwZ4s80wfw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=okstate.edu; dmarc=pass action=none header.from=okstate.edu; dkim=pass header.d=okstate.edu; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ostatemailokstate.onmicrosoft.com; s=selector1-ostatemailokstate-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=8LAd9HrROldFWOEAIFLzgWAxhCi7whWQyXfT735gVQg=; b=I/T2tUB5h0OIRJwUSVrul7w+Uwm9KNWJFgdDeoQvCmp8R0u9h6U5BUdYwfnNt3/chCrx0MJ40q2rhKuKdF6cG3B0vMOmt3QvRTCD9OfhZsAE3gEmZll91PnmAyWlm4NBYkgrhSMkNgpg+9hCs8YmkU2AcBZesWigH27IG7ZOI/g= Received: from DM5PR03MB3306.namprd03.prod.outlook.com (2603:10b6:4:40::33) by DS7PR03MB5447.namprd03.prod.outlook.com (2603:10b6:5:2c7::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4042.16; Wed, 14 Apr 2021 03:53:12 +0000 Received: from DM5PR03MB3306.namprd03.prod.outlook.com ([fe80::ddc8:4ccf:3f91:6335]) by DM5PR03MB3306.namprd03.prod.outlook.com ([fe80::ddc8:4ccf:3f91:6335%3]) with mapi id 15.20.4020.022; Wed, 14 Apr 2021 03:53:12 +0000 From: "Hass, Trevor Stenten" Thread-Topic: [PATCH] gnu: minetest: Fix absolute path to 'rm' command. Thread-Index: AQHXMN4yEEBsr6ZygEWgNodwhAUD1w== Date: Wed, 14 Apr 2021 03:53:12 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: yes X-MS-TNEF-Correlator: authentication-results: gnu.org; dkim=none (message not signed) header.d=none;gnu.org; dmarc=none action=none header.from=okstate.edu; x-originating-ip: [67.206.113.121] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0f13e826-4523-4c3e-5e8b-08d8fef8d360 x-ms-traffictypediagnostic: DS7PR03MB5447: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8882; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 9wGY0MDHC3whvU8xD4kraJwvu34B00iUsGn6BJFZElD2Pa9uHlsogHkvwUsI1bNDAE3CPn6idQY7cwjM4hI8e/yQHnstIwVqsP5COp0MV4bUy6dE7ncPB4rKNZ1WsLwYbTKJtn3sG2EKzrowdCFP1j7ofwGNWMmCM00eAotlpa8prWqopNB38nYbUG0Pv9SS3YqAiVuP2Hw3IVVxU/KJRFfVJcvuUsRIRPF/5MYoHc6V8t3GyncwodivIzzRF0cvfCk0KUJolkMVfWwIDb9r7kTqVWuNAyIkAeBJBSXFsJX7adXTpqD7+6z6mKSdzGi1inquswgeh1UJ/KfRRbCQZSFml8omOlge6rM3RJcyJN5OZUvJ1HZRYAd4xQSPkfDm1sKMM9oFXRXb0bKgtjHkY0mjw1Adgh4NRPp2L4LfUpMcel03cO7EWn8jbXUi+MNkAaky1EU5ur4Wm+v6+kA4s/58LhBePuuwoajfk43ALScjyWVCIAp3NGOkMdLOMd91NmGPryKG33oAgvFU49SruR+9Wn476iFJYVYvBgfYBzi75gOy7koKjkS8j6dYnj4ozyF7sLoBbtm6oeX64CO0ug== x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DM5PR03MB3306.namprd03.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(396003)(376002)(346002)(366004)(136003)(39860400002)(38100700002)(8676002)(9686003)(99936003)(26005)(33656002)(55016002)(122000001)(8936002)(6916009)(2906002)(186003)(83380400001)(66446008)(64756008)(66556008)(66946007)(66476007)(66616009)(76116006)(91956017)(5660300002)(478600001)(558084003)(52536014)(19627405001)(7696005)(75432002)(316002)(86362001)(786003)(6506007)(71200400001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: TViMOXOjx0nYS4qkMWvUlR0DMj3nvATrOaklK5JybZNB/5ME7GTYF781pgVlp7wIr7WwScfhi8XWnuy/84rpeKtl6Py69NPVEg7PizK9cuGaEIYIQgtUYH11HME+xpY9DScW30DMp1pp0XlqojnJlqqQhJjz9QurkblPU5OUT38LBHSa9lzwuBbxTNLm9Q01dY3IOefJJKppHi+4qU8xOZNRPGxPqJQCf75x11r9lAOQAxzOYnPaKP8hRRJDy0+6wXCmOkvwz6udZPkHVF3EL1fCNYeadEh/RSeEfL8rrYlubK/8wK86vGWAwlOEoYkItxF+ruMv4qu/HA7NtZ14fTSJpjnhpDleFkAvat0kXFyvk0r7bzyYCEWqLz1CfjSUIk9s/scV5Tr9LbrPuD7l68DgLCfVWnwtZc+NO4Likn2KHvL0/nfzMOyK9ca9OWZIvdpR8eJZe3GhDhPkVxn7O5GFC6xeKBwC/2HTq3JDkfYq71otlwCOWk4XSA8p3lE0E/frgkM1VmC+KPxF342uPzbb+T3USu4cYU45x2KqBppJxhEFLPUelr/cSB+qALYV6nLqjDD4n2Klp3afcaEnR8DaGI8JzJJpvbog/bG4vaRcYcaBzl37rN7RCCjnYxWgHXwIgwzlOkC6SUNqVsFSQ3nC66b0BcsA9IbLNVp3Ezk1mbtbSqEKe5GDkhEerbs3V6oc5bEh2zQI3C47MiijLh+QaB9V9jRgaWPAXeMLiKokoIoPcLOj6Y5ih4BNL9vXcFfwe6JDAHHhu7s5J/lT2tO13V2HOXIkh25H9hjClo0lwJXUngQQKb6RGdwlHiY8n1RHyQ8wNx5uP8PD9CYRRsL9p0+mmt0rBcYAPQTnMLc0bU9M4YFDOY5K9wad7ie+t3UnXaKI5WoJikmtuxBNQMhsmwwgUmxHdZwQ75NDvGiVSJBOuVkDuD0olF1tRO6UNqsIk8WqTOCGC1nBd9dGyWXAinwaCRa242MHXi9TLtOZuA18Ho0lzsQuiptNXYTMsOalkIJ6IaGdkKY/+JA0nMeApumd/DonUmQYdL9pmvIpGz+mb+N6pIqTVBG6mwW9QPMg5Fa6W/wOx0o6RIEuWvtRFE/9GNWeYbHGEAK6jQUGSFYU0KsNvCQW8kiySgEqRgS3Z6pgp8GQy2+spvYr0dro+qsIRIOYgW9eSdHQvVx+YGASNkhCh3lBkQhMPWUws838sINo6MoFIJcKn5uY0VDyQnhtNoe/N8G9btl7c6O7yrJ+MqZbJkCBQPsqmg9zBYz477LOqdvqKRMdKFhu+fSYYZ5rspFMY925TvpFAqo= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: okstate.edu X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DM5PR03MB3306.namprd03.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0f13e826-4523-4c3e-5e8b-08d8fef8d360 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Apr 2021 03:53:12.3398 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 2a69c91d-e849-4e34-a230-cdf8b27e1964 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1ceDKhDGfX/HR0+u8E/39esOpHiZSrIf1GekQVTHZoOmDxp2nE08inELsfkXeKtewRswZX0aOJbe24SNlZSHvw== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DS7PR03MB5447 Received-SPF: pass client-ip=40.107.76.40; envelope-from=thass@okstate.edu; helo=NAM02-CY1-obe.outbound.protection.outlook.com X-Spam_score_int: -8 X-Spam_score: -0.9 X-Spam_bar: / X-Spam_report: (-0.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, HTML_MESSAGE=0.001, RCVD_DOTEDU_SHORT=1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001 autolearn=no 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: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches Hello Guix, The attached patch resolves an issue where Minetest cannot delete worlds or downloaded content. Thank you, Trevor From b420ef5912b6b04023991f44db3e8a4f32091022 Mon Sep 17 00:00:00 2001 From: Trevor Hass Date: Tue, 13 Apr 2021 22:05:08 -0500 Subject: [PATCH] gnu: minetest: Fix absolute path to 'rm' command. * gnu/packages/games.scm (minetest): Add 'set-rm' phase to substitute absolute path to 'rm'. Add 'coreutils' to inputs. --- gnu/packages/games.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/games.scm b/gnu/packages/games.scm index dbc72446b2..6dedfa7419 100644 --- a/gnu/packages/games.scm +++ b/gnu/packages/games.scm @@ -52,7 +52,7 @@ ;;; Copyright © 2020 Jack Hill ;;; Copyright © 2020 Vincent Legoll ;;; Copyright © 2020, 2021 Michael Rohleder -;;; Copyright © 2020 Trevor Hass +;;; Copyright © 2020, 2021 Trevor Hass ;;; Copyright © 2020, 2021 Leo Prikler ;;; Copyright © 2020 Lu hux ;;; Copyright © 2020 Tomás Ortín Fernández @@ -3496,6 +3496,12 @@ match, cannon keep, and grave-itation pit.") (setenv "MINETEST_SUBGAME_PATH" (string-append (getcwd) "/games")) ; for check #t)) + (add-after 'unpack 'set-rm + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/filesys.cpp" + (("\"/bin/rm\"") + (string-append "\"" (assoc-ref inputs "coreutils") "/bin/rm\""))) + #t)) (replace 'check (lambda _ ;; Thanks to our substitutions, the tests should also run @@ -3511,7 +3517,8 @@ match, cannon keep, and grave-itation pit.") (native-inputs `(("pkg-config" ,pkg-config))) (inputs - `(("curl" ,curl) + `(("coreutils" ,coreutils) + ("curl" ,curl) ("freetype" ,freetype) ("gettext" ,gettext-minimal) ("gmp" ,gmp) -- 2.31.1