From patchwork Tue Jun 2 13:20:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brice Waegeneire X-Patchwork-Id: 22526 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 BA92627BBE3; Tue, 2 Jun 2020 14:22:08 +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.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL 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 ESMTP id 644EB27BBE1 for ; Tue, 2 Jun 2020 14:22:08 +0100 (BST) Received: from localhost ([::1]:33412 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jg6rn-0000xP-H9 for patchwork@mira.cbaines.net; Tue, 02 Jun 2020 09:22:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg6ri-0000x8-Du for guix-patches@gnu.org; Tue, 02 Jun 2020 09:22:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54881) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jg6ri-0000M5-4u for guix-patches@gnu.org; Tue, 02 Jun 2020 09:22:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jg6ri-0004Hm-0O for guix-patches@gnu.org; Tue, 02 Jun 2020 09:22:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41662] [PATCH] gnu: zsh: Set default '$fpath'. Resent-From: Brice Waegeneire Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 02 Jun 2020 13:22:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 41662 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41662@debbugs.gnu.org X-Debbugs-Original-To: guix-patches@gnu.org Received: via spool by submit@debbugs.gnu.org id=B.159110406616409 (code B ref -1); Tue, 02 Jun 2020 13:22:01 +0000 Received: (at submit) by debbugs.gnu.org; 2 Jun 2020 13:21:06 +0000 Received: from localhost ([127.0.0.1]:38193 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jg6qn-0004Gb-WA for submit@debbugs.gnu.org; Tue, 02 Jun 2020 09:21:06 -0400 Received: from lists.gnu.org ([209.51.188.17]:35714) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jg6qj-0004G1-Jn for submit@debbugs.gnu.org; Tue, 02 Jun 2020 09:21:05 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56028) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg6qj-0000q7-E6 for guix-patches@gnu.org; Tue, 02 Jun 2020 09:21:01 -0400 Received: from relay12.mail.gandi.net ([217.70.178.232]:48085) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jg6qi-00006g-40 for guix-patches@gnu.org; Tue, 02 Jun 2020 09:21:00 -0400 Received: from localhost (luy13-1-78-237-113-178.fbx.proxad.net [78.237.113.178]) (Authenticated sender: brice@waegenei.re) by relay12.mail.gandi.net (Postfix) with ESMTPSA id 66A28200008 for ; Tue, 2 Jun 2020 13:20:56 +0000 (UTC) From: Brice Waegeneire Date: Tue, 2 Jun 2020 15:20:48 +0200 Message-Id: <20200602132048.24761-1-brice@waegenei.re> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Received-SPF: pass client-ip=217.70.178.232; envelope-from=brice@waegenei.re; helo=relay12.mail.gandi.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/02 09:20:56 X-ACL-Warn: Detected OS = Linux 3.11 and newer X-Spam_score_int: -25 X-Spam_score: -2.6 X-Spam_bar: -- X-Spam_report: (-2.6 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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 * gnu/packages/shells.scm (zsh)[arguments]: Add configure-flags 'disable-site-dir' and 'enable-additional-fpath'. --- gnu/packages/shells.scm | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/gnu/packages/shells.scm b/gnu/packages/shells.scm index 74d08e02bc..250c6d5576 100644 --- a/gnu/packages/shells.scm +++ b/gnu/packages/shells.scm @@ -441,8 +441,16 @@ history mechanism, job control and a C-like syntax.") (base32 "09yyaadq738zlrnlh1hd3ycj1mv3q5hh4xl1ank70mjnqm6bbi6w")))) (build-system gnu-build-system) - (arguments `(#:configure-flags '("--with-tcsetpgrp" "--enable-pcre" - "--enable-maildir-support") + (arguments `(#:configure-flags + `("--with-tcsetpgrp" + "--enable-pcre" + "--enable-maildir-support" + ;; share/zsh/site-functions isn't populated + "--disable-site-fndir" + ,(string-append + "--enable-additional-fpath=" + "/usr/local/share/zsh/site-functions," ; for foreign OS + "/run/current-system/profile/share/zsh/site-functions")) #:phases (modify-phases %standard-phases (add-before 'configure 'fix-sh