gnu: QtWebEngine: Propagate required dependencies.
* gnu/packages/qt.scm (qtwebengine-5)[inputs]: Move QTBASE-5, QTDECLARATIVE-5, and QTWEBCHANNEL-5 ... [propagated-inputs]: ... here. (qtwebengine)[inputs, propagated-inputs]: Adjust accordingly.
This commit is contained in:
parent
a9956536f3
commit
3ecd59f08c
1 changed files with 8 additions and 6 deletions
|
@ -2579,16 +2579,16 @@ using the Enchant spell-checking library.")
|
||||||
pciutils
|
pciutils
|
||||||
protobuf
|
protobuf
|
||||||
pulseaudio
|
pulseaudio
|
||||||
qtbase-5
|
|
||||||
qtdeclarative-5
|
|
||||||
qtmultimedia-5
|
qtmultimedia-5
|
||||||
qtwebchannel-5
|
|
||||||
re2
|
re2
|
||||||
snappy
|
snappy
|
||||||
eudev
|
eudev
|
||||||
valgrind
|
valgrind
|
||||||
vulkan-headers
|
vulkan-headers
|
||||||
xcb-util))
|
xcb-util))
|
||||||
|
(propagated-inputs
|
||||||
|
;; Required by Qt5WebEngineCoreConfig.cmake.
|
||||||
|
(list qtbase-5 qtdeclarative-5 qtwebchannel-5))
|
||||||
(arguments
|
(arguments
|
||||||
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
(substitute-keyword-arguments (package-arguments qtsvg-5)
|
||||||
((#:modules modules '())
|
((#:modules modules '())
|
||||||
|
@ -2983,11 +2983,13 @@ linux/libcurl_wrapper.h"
|
||||||
python-html5lib)))
|
python-html5lib)))
|
||||||
(inputs
|
(inputs
|
||||||
(modify-inputs (package-inputs qtwebengine-5)
|
(modify-inputs (package-inputs qtwebengine-5)
|
||||||
|
(replace "qtmultimedia" qtmultimedia)
|
||||||
|
(append libxkbfile xkeyboard-config)))
|
||||||
|
(propagated-inputs
|
||||||
|
(modify-inputs (package-propagated-inputs qtwebengine-5)
|
||||||
(replace "qtbase" qtbase)
|
(replace "qtbase" qtbase)
|
||||||
(replace "qtdeclarative" qtdeclarative)
|
(replace "qtdeclarative" qtdeclarative)
|
||||||
(replace "qtmultimedia" qtmultimedia)
|
(replace "qtwebchannel" qtwebchannel)))
|
||||||
(replace "qtwebchannel" qtwebchannel)
|
|
||||||
(append libxkbfile xkeyboard-config)))
|
|
||||||
(native-search-paths
|
(native-search-paths
|
||||||
(list (search-path-specification
|
(list (search-path-specification
|
||||||
(file-type 'regular)
|
(file-type 'regular)
|
||||||
|
|
Reference in a new issue