From 381000d794e970446a52b1ce2d4b79bc63e06f7b Mon Sep 17 00:00:00 2001 From: Clément Lassieur Date: Sat, 10 Sep 2016 23:13:32 +0200 Subject: gnu: python-git-review: Wrap it so 'git', 'ssh' and 'scp' are found. * gnu/packages/openstack.scm (python-git-review)[arguments]: Add 'wrap-program' phase. [inputs]: Add openssh. Signed-off-by: Efraim Flashner --- gnu/packages/openstack.scm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'gnu/packages/openstack.scm') diff --git a/gnu/packages/openstack.scm b/gnu/packages/openstack.scm index 4cb38a9fc8..62f1e84a3b 100644 --- a/gnu/packages/openstack.scm +++ b/gnu/packages/openstack.scm @@ -20,6 +20,7 @@ (define-module (gnu packages openstack) #:use-module (gnu packages python) + #:use-module (gnu packages ssh) #:use-module (gnu packages tls) #:use-module (gnu packages version-control) #:use-module (guix build-system python) @@ -796,12 +797,26 @@ (define-public python-git-review (base32 "07d1jn9ryff5j5ic6qj5pbk10m1ccmpllj0wyalrcms1q9yhlzh8")))) (build-system python-build-system) - (arguments `(#:tests? #f)) ; tests require a running Gerrit server + (arguments + '(#:tests? #f ; tests require a running Gerrit server + #:phases + (modify-phases %standard-phases + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (git (assoc-ref inputs "git")) + (openssh (assoc-ref inputs "openssh"))) + (wrap-program (string-append out "/bin/git-review") + `("PATH" ":" prefix + ,(map (lambda (dir) + (string-append dir "/bin")) + (list git openssh)))))))))) (native-inputs `(("python-pbr" ,python-pbr))) (inputs `(("python-requests" ,python-requests) - ("git" ,git))) + ("git" ,git) + ("openssh" ,openssh))) (home-page "http://docs.openstack.org/infra/git-review/") (synopsis "Command-line tool for Gerrit") (description -- cgit v1.2.3