me
/
guix
Archived
1
0
Fork 0
Code

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.
master
Marius Bakke 2022-08-11 18:51:58 +02:00
parent f441a149b4
commit 25c2a2fdb2
No known key found for this signature in database
GPG Key ID: A2A06DF2A33A54FA
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gnu/packages/vpn.scm
View File

@ -722,27 +722,26 @@ and probably others.")
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-after 'unpack 'patch-openconnect (add-after 'unpack 'patch-openconnect
(lambda _ (lambda* (#:key inputs #:allow-other-keys)
(substitute* "openconnect_sso/app.py" (substitute* "openconnect_sso/app.py"
(("\"openconnect\"") (("\"openconnect\"")
(string-append "\"" (which "openconnect") "\""))) (string-append "\""
#t)) (search-input-file inputs "/sbin/openconnect")
"\"")))))
(replace 'check (replace 'check
(lambda* (#:key tests? #:allow-other-keys) (lambda* (#:key tests? #:allow-other-keys)
(when tests? (when tests?
(invoke "pytest" "-v")) (invoke "pytest" "-v"))))
#t))
(add-after 'install 'wrap-qt-process-path (add-after 'install 'wrap-qt-process-path
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out")) (let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/openconnect-sso")) (bin (string-append out "/bin/openconnect-sso"))
(qt-process-path (string-append (qt-process-path
(assoc-ref inputs "qtwebengine-5") (search-input-file inputs
"/lib/qt5/libexec/QtWebEngineProcess"))) "/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin (wrap-program bin
#:sh (search-input-file inputs "bin/bash") #:sh (search-input-file inputs "bin/bash")
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path))) `("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))))))))
#t))))))
(inputs (inputs
(list openconnect (list openconnect
python-attrs python-attrs