From d6d06ee2377e2366767e53365dbcfa42e62971d7 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 29 May 2022 02:00:00 +0200 Subject: gnu: cloud-utils: Fix wrapping. * gnu/packages/admin.scm (cloud-utils)[arguments]: Search for readlink & sfdisk in inputs. [inputs]: Add coreutils. --- gnu/packages/admin.scm | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) (limited to 'gnu/packages/admin.scm') diff --git a/gnu/packages/admin.scm b/gnu/packages/admin.scm index f30509a0ff..e9787f1c43 100644 --- a/gnu/packages/admin.scm +++ b/gnu/packages/admin.scm @@ -419,7 +419,11 @@ inspired by @command{vi}.") "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk")))) (build-system gnu-build-system) (arguments - '(#:make-flags + '(#:modules + ((guix build gnu-build-system) + (guix build utils) + (srfi srfi-26)) + #:make-flags (let ((out (assoc-ref %outputs "out"))) (list (string-append "BINDIR=" out "/bin") (string-append "MANDIR=" out "/share/man/man1") @@ -433,10 +437,15 @@ inspired by @command{vi}.") (let ((growpart (string-append (assoc-ref outputs "out") "/bin/growpart"))) (wrap-program growpart - `("PATH" ":" prefix (,(dirname (which "sfdisk")) - ,(dirname (which "readlink"))))))))))) + `("PATH" ":" prefix + ,(map dirname + (map (cut search-input-file inputs <>) + (list "bin/readlink" + "sbin/sfdisk"))))))))))) (inputs - (list python util-linux)) ; contains sfdisk for growpart + (list coreutils ; for readlink + python + util-linux)) ; sfdisk for growpart (home-page "https://launchpad.net/cloud-utils") (synopsis "Set of utilities for cloud computing environments") (description -- cgit v1.2.3