From 25c2a2fdb21742f479df113202e7955f3a1ccc52 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Thu, 11 Aug 2022 18:51:58 +0200 Subject: gnu: openconnect-sso: Remove input labels. * gnu/packages/vpn.scm (openconnect-sso)[arguments]: Don't attempt to use a non-existent QtWebEngine label. While at it, use SEARCH-INPUT-FILE also for openconnect and remove trailing #t's. --- gnu/packages/vpn.scm | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'gnu/packages/vpn.scm') diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 17dd163c53..c4e0287bf8 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm @@ -722,27 +722,26 @@ (define-public openconnect-sso #:phases (modify-phases %standard-phases (add-after 'unpack 'patch-openconnect - (lambda _ + (lambda* (#:key inputs #:allow-other-keys) (substitute* "openconnect_sso/app.py" (("\"openconnect\"") - (string-append "\"" (which "openconnect") "\""))) - #t)) + (string-append "\"" + (search-input-file inputs "/sbin/openconnect") + "\""))))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? - (invoke "pytest" "-v")) - #t)) + (invoke "pytest" "-v")))) (add-after 'install 'wrap-qt-process-path (lambda* (#:key inputs outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) (bin (string-append out "/bin/openconnect-sso")) - (qt-process-path (string-append - (assoc-ref inputs "qtwebengine-5") - "/lib/qt5/libexec/QtWebEngineProcess"))) + (qt-process-path + (search-input-file inputs + "/lib/qt5/libexec/QtWebEngineProcess"))) (wrap-program bin #:sh (search-input-file inputs "bin/bash") - `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) - #t)))))) + `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))))))))) (inputs (list openconnect python-attrs -- cgit v1.2.3