From patchwork Fri Apr 1 21:32:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: ykonai X-Patchwork-Id: 38289 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 DCB2127BBE9; Sat, 2 Apr 2022 15:13:02 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,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 775BC27BBEA for ; Sat, 2 Apr 2022 15:13:02 +0100 (BST) Received: from localhost ([::1]:36628 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1naeUv-0008Hj-9L for patchwork@mira.cbaines.net; Sat, 02 Apr 2022 10:13:01 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53534) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naSaY-00051J-OE for guix-patches@gnu.org; Fri, 01 Apr 2022 21:30:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50114) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1naSaY-0001bd-DW for guix-patches@gnu.org; Fri, 01 Apr 2022 21:30:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1naSaY-00072s-9a for guix-patches@gnu.org; Fri, 01 Apr 2022 21:30:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#54676] [PATCH] gnu: Fix plocate package Resent-From: ykonai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Apr 2022 01:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 54676 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 54676@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.164886298227033 (code B ref -1); Sat, 02 Apr 2022 01:30:02 +0000 Received: (at submit) by debbugs.gnu.org; 2 Apr 2022 01:29:42 +0000 Received: from localhost ([127.0.0.1]:44011 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naSaC-00071v-UG for submit@debbugs.gnu.org; Fri, 01 Apr 2022 21:29:41 -0400 Received: from lists.gnu.org ([209.51.188.17]:46816) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1naOyp-0000wM-PL for submit@debbugs.gnu.org; Fri, 01 Apr 2022 17:38:52 -0400 Received: from eggs.gnu.org ([209.51.188.92]:59882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naOyp-0004aT-HW for guix-patches@gnu.org; Fri, 01 Apr 2022 17:38:51 -0400 Received: from [2605:6400:10:1424:8f2:1eb3:b35b:fe2d] (port=34784 helo=www.ykonai.net) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1naOyo-000525-3C for guix-patches@gnu.org; Fri, 01 Apr 2022 17:38:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ykonai.net; s=dkim; t=1648848771; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=mokr934co7Nojp3LDUXrdiUMhGU9WHJD5Fhz62DlTf4=; b=mjEhKARAfEnQfBdVFaxuJCsvzSSziyO8woT7Etyk0XTmUWOE4kRSfCJI+tTQLOwRdNZ8Sh B3GxTxL6gBJINCbJZ6/fksPq8HeT+iowOlcUQIIsr0lLERcT4+G9jJvjsoMTtGBIrsHdtx +R2pHCBmDfrQpxgYk7NLIa1G78I0pGA= Received: by www.ykonai.net (OpenSMTPD) with ESMTPSA id 1d532d65 (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO) for ; Fri, 1 Apr 2022 21:32:51 +0000 (UTC) Date: Fri, 1 Apr 2022 23:32:04 +0200 Message-Id: <20220401213204.29639-1-mail@ykonai.net> X-Mailer: git-send-email 2.34.0 MIME-Version: 1.0 X-Host-Lookup-Failed: Reverse DNS lookup failed for 2605:6400:10:1424:8f2:1eb3:b35b:fe2d (failed) Received-SPF: pass client-ip=2605:6400:10:1424:8f2:1eb3:b35b:fe2d; envelope-from=mail@ykonai.net; helo=www.ykonai.net X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-Mailman-Approved-At: Fri, 01 Apr 2022 21:29:40 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Mailman-Approved-At: Sat, 02 Apr 2022 10:12:36 -0400 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" Reply-to: ykonai X-ACL-Warn: , ykonai via Guix-patches X-Patchwork-Original-From: ykonai via Guix-patches via From: ykonai X-getmail-retrieved-from-mailbox: Patches * gnu/packages/search.scm (plocate): Change build options. --- Current plocate package sets the --sharedstatedir to a store directory, which causes updatedb and plocate to fail by default since the store is immutable. This will set the default database path to /var/cache/plocate.db instead. gnu/packages/search.scm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) base-commit: a27cef76c29ba6ef0d7c203783b758ea2d5331d7 diff --git a/gnu/packages/search.scm b/gnu/packages/search.scm index 6f8d673694..87f29c5424 100644 --- a/gnu/packages/search.scm +++ b/gnu/packages/search.scm @@ -487,8 +487,17 @@ (define-public plocate (arguments `(#:configure-flags (list - (string-append - "--sharedstatedir=" (assoc-ref %outputs "out") "/var")))) + ;; Put the database in /var/cache/plocate.db + "--sharedstatedir=/var" + "-Dinstall_systemd=false" + "-Ddbpath=cache/plocate.db") + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'remove-cachedirtag + (lambda _ + (substitute* "meson.build" + ;; Remove the script adding a "cachedirtag" + (("meson.add_install_script") "#"))))))) (inputs (list liburing `(,zstd "lib")))