From d485faf633a636e4db11c83fb1215240b4fd0e87 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 21 Jun 2022 17:05:16 +0200 Subject: [PATCH] gnu: zabbix-cli: Use new style. * gnu/packages/monitoring.scm (zabbix-cli)[arguments]: Use SEARCH-INPUT-FILE. [inputs]: Remove labels. --- gnu/packages/monitoring.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/monitoring.scm b/gnu/packages/monitoring.scm index 2e04c32f0a..d925953eab 100644 --- a/gnu/packages/monitoring.scm +++ b/gnu/packages/monitoring.scm @@ -266,18 +266,18 @@ (define-public zabbix-cli (arguments '(#:phases (modify-phases %standard-phases (add-after 'unpack 'use-absolute-ncurses - (lambda _ - (substitute* "bin/zabbix-cli" - (("'clear'") - (string-append "'" (which "clear") "'"))))) + (lambda* (#:key inputs #:allow-other-keys) + (let ((clear (search-input-file inputs "bin/clear"))) + (substitute* "bin/zabbix-cli" + (("'clear'") + (string-append "'" clear "'")))))) (add-after 'unpack 'patch-setup.py (lambda _ ;; Install data_files to $out/share instead of /usr/share. (substitute* "setup.py" (("/usr/") ""))))))) (inputs - `(("clear" ,ncurses) - ("python-requests" ,python-requests))) + (list ncurses python-requests)) (home-page "https://github.com/unioslo/zabbix-cli") (synopsis "Command-line interface to Zabbix") (description