From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id oMS6F/7TI18AVwAA0tVLHw (envelope-from ) for ; Fri, 31 Jul 2020 08:19:10 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id 8G2EE/7TI1+NIQAAB5/wlQ (envelope-from ) for ; Fri, 31 Jul 2020 08:19:10 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 95B64940223 for ; Fri, 31 Jul 2020 08:19:09 +0000 (UTC) Received: from localhost ([::1]:49696 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k1QFw-0007cZ-JD for larch@yhetil.org; Fri, 31 Jul 2020 04:19:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57612) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QFr-0007cS-0i for guix-patches@gnu.org; Fri, 31 Jul 2020 04:19:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:53990) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k1QFq-0003xZ-Ny for guix-patches@gnu.org; Fri, 31 Jul 2020 04:19:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k1QFq-0006wx-Ki for guix-patches@gnu.org; Fri, 31 Jul 2020 04:19:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42627] [PATCH] gnu: awesome: Fix command completion in the prompt and Lua paths Resent-From: Ivan Kozlov Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 31 Jul 2020 08:19:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 42627 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42627@debbugs.gnu.org X-Debbugs-Original-To: guix-patches Received: via spool by submit@debbugs.gnu.org id=B.159618351826683 (code B ref -1); Fri, 31 Jul 2020 08:19:02 +0000 Received: (at submit) by debbugs.gnu.org; 31 Jul 2020 08:18:38 +0000 Received: from localhost ([127.0.0.1]:37303 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1QFS-0006wJ-2M for submit@debbugs.gnu.org; Fri, 31 Jul 2020 04:18:38 -0400 Received: from lists.gnu.org ([209.51.188.17]:52164) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k1QFO-0006wB-Jw for submit@debbugs.gnu.org; Fri, 31 Jul 2020 04:18:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:57568) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QFO-0007ax-3F for guix-patches@gnu.org; Fri, 31 Jul 2020 04:18:34 -0400 Received: from forward102j.mail.yandex.net ([5.45.198.243]:54426) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k1QFL-0003wL-4g for guix-patches@gnu.org; Fri, 31 Jul 2020 04:18:33 -0400 Received: from mxback2o.mail.yandex.net (mxback2o.mail.yandex.net [IPv6:2a02:6b8:0:1a2d::1c]) by forward102j.mail.yandex.net (Yandex) with ESMTP id EA948F2130B for ; Fri, 31 Jul 2020 11:18:23 +0300 (MSK) Received: from localhost (localhost [::1]) by mxback2o.mail.yandex.net (mxback/Yandex) with ESMTP id DWmJxV9Qsc-INYC3TfH; Fri, 31 Jul 2020 11:18:23 +0300 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yandex.ru; s=mail; t=1596183503; bh=fCrwKpEOJEXibcYRgrshG8fnStmFRwXF0FQCSBoDSCs=; h=Message-Id:Date:Subject:To:From; b=HX04K/jhJcwe/FlwcUnV0duclSlQfwgg/i3mPvwTrVhAWDxfCpVU4MmxZlE1hww8j Z5kAU3DnX/iSUILW3P6yfi2Pe85pcoa7gH1wNi/+8jL/R8/Q/nx4V5VAdjo4FUseNB 5PXgnaSRokiKNgemyAttWd2n9zEnZD3uKWzG8k/4= Received: by myt4-01544bcb68a1.qloud-c.yandex.net with HTTP; Fri, 31 Jul 2020 11:18:23 +0300 From: Ivan Kozlov MIME-Version: 1.0 X-Mailer: Yamail [ http://yandex.ru ] 5.0 Date: Fri, 31 Jul 2020 11:18:23 +0300 Message-Id: <484421596182827@mail.yandex.ru> Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=utf-8 Received-SPF: pass client-ip=5.45.198.243; envelope-from=kanichos@yandex.ru; helo=forward102j.mail.yandex.net X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/31 04:18:24 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] [fuzzy] X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 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, FREEMAIL_FROM=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -2.3 (--) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=yandex.ru header.s=mail header.b=HX04K/jh; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yandex.ru (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: 0.09 X-TUID: TAipFKR8UiRy * gnu/packages/wm.scm (awesome): Delete useless ‘env’ invocation in lib/awful/completion.lua. Change the delimiter for LUA_PATH and LUA_CPATH variables. diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index def8fdccd2..133865771a 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -947,6 +947,9 @@ experience.") (modify-phases %standard-phases (add-before 'configure 'set-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "lib/awful/completion.lua" + (("/usr/bin/env") + "")) ;; The build process needs to load Cairo dynamically. (let* ((cairo (string-append (assoc-ref inputs "cairo") "/lib")) (lua-version ,(version-major+minor (package-version lua))) @@ -995,9 +998,9 @@ experience.") (lua-version ,(version-major+minor (package-version lua))) (lua-lgi (assoc-ref inputs "lua-lgi"))) (wrap-program (string-append awesome "/bin/awesome") - `("LUA_PATH" suffix + `("LUA_PATH" ";" suffix (,(format #f "~a/share/lua/~a/?.lua" lua-lgi lua-version))) - `("LUA_CPATH" suffix + `("LUA_CPATH" ";" suffix (,(format #f "~a/lib/lua/~a/?.so" lua-lgi lua-version))) `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH"))) `("LD_LIBRARY_PATH" suffix (,cairo)))