1
Fork 0
mirror of https://https.git.savannah.gnu.org/git/guix.git/ synced 2025-07-16 03:50:45 +02:00

Merge branch 'staging' into core-updates

This commit is contained in:
Marius Bakke 2022-08-11 23:36:10 +02:00
commit 77eb3008e3
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
318 changed files with 180633 additions and 187391 deletions

View file

@ -374,7 +374,7 @@ local system.")
(let* ((out (assoc-ref outputs "out"))
(bin (string-append out "/bin/zeal"))
(qt-process-path (string-append
(assoc-ref inputs "qtwebengine")
(assoc-ref inputs "qtwebengine-5")
"/lib/qt5/libexec/QtWebEngineProcess")))
(wrap-program bin
`("QTWEBENGINEPROCESS_PATH" = (,qt-process-path)))
@ -385,10 +385,10 @@ local system.")
`(("libarchive" ,libarchive)
("sqlite" ,sqlite)
("qtbase" ,qtbase-5)
("qtdeclarative" ,qtdeclarative)
("qtwebchannel" ,qtwebchannel)
("qtwebengine" ,qtwebengine)
("qtquickcontrols" ,qtquickcontrols)
("qtdeclarative-5" ,qtdeclarative-5)
("qtwebchannel-5" ,qtwebchannel-5)
("qtwebengine-5" ,qtwebengine-5)
("qtquickcontrols-5" ,qtquickcontrols-5)
("qtx11extras" ,qtx11extras)
("xcb-util-keyms" ,xcb-util-keysyms)))
(home-page "https://zealdocs.org/")