From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33827) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1e0Ddh-0007TE-4d for guix-patches@gnu.org; Thu, 05 Oct 2017 17:25:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1e0Dde-00033z-1T for guix-patches@gnu.org; Thu, 05 Oct 2017 17:25:05 -0400 Received: from debbugs.gnu.org ([208.118.235.43]:43196) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1e0Ddd-00033i-Uy for guix-patches@gnu.org; Thu, 05 Oct 2017 17:25:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1e0Ddd-0007t4-PB for guix-patches@gnu.org; Thu, 05 Oct 2017 17:25:01 -0400 Subject: [bug#28693] [PATCH] gnu: Add missing input to python-py3status and fix call path. Resent-Message-ID: From: =?UTF-8?Q?Tom=C3=A1=C5=A1_?= =?UTF-8?Q?=C4=8Cech?= Date: Thu, 5 Oct 2017 23:24:39 +0200 Message-Id: <20171005212439.26407-1-sleep_walker@gnu.org> In-Reply-To: <20171004075944.1e5a7cbf@cbaines.net> References: <20171004075944.1e5a7cbf@cbaines.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Christopher Baines Cc: 28693@debbugs.gnu.org * gnu/packages/python.scm (python-py3status)[inputs, arguments]: Add missing file utility as input, adjust path used to call it. file is used to determine configuration file encoding and py3status fails to start when this tool is missing. --- gnu/packages/python.scm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/gnu/packages/python.scm b/gnu/packages/python.scm index 6ffd468b3..426ff12eb 100644 --- a/gnu/packages/python.scm +++ b/gnu/packages/python.scm @@ -11468,8 +11468,21 @@ to occurrences in strings and comments.") (base32 "0i283z1pivmir61z8kbiycigc94l61v33ygzkhczf1ifq7cppyds")))) (build-system python-build-system) + (inputs + `(("file" ,file))) (arguments - '(#:tests? #f)) ; TODO: Requires many libraries not in Guix. + '(#:phases + (modify-phases %standard-phases + ;; 'file' is used for detection of configuration file encoding + ;; let's make link the dependency to particular input + (add-before 'build 'patch-file-path + (lambda* (#:key inputs #:allow-other-keys) + (let ((file-path (assoc-ref inputs "file"))) + (substitute* "py3status/parse_config.py" + (("check_output\\(\\['file'") + (string-append "check_output(['" file-path "/bin/file'"))) + #t)))) + #:tests? #f)) ; TODO: Requires many libraries not in Guix. (home-page "https://github.com/ultrabug/py3status") (synopsis "Extensible i3status wrapper written in Python") (description "py3status is an i3status wrapper which extends i3status -- 2.14.2