~ruther/guix-local

d14cfbedb48e51e11a88b7a79bd9ef6821813046 — Sharlatan Hellseher 6 months ago df0983f 
gnu: qtwebengine: Don't inherit inputs from qtwebengine-5

* gnu/packages/qt.scm (qtwebengine)[inputs]: Add alsa-lib, at-spi2-core,
cups-minimal, curl, dbus, eudev, ffmpeg, fontconfig, fxdiv, harfbuzz,
icu4c, jsoncpp, lcms, libcap, libevent, libgcrypt, libjpeg-turbo,
libvpx, libwebp, libx11, libxcb, libxcomposite, libxcursor, libxi,
libxkbcommon, libxkbfile, libxml2, libxrandr, libxrender, libxslt,
libxtst, mesa, minizip, nss, openh264, opus, pciutils, protobuf,
pulseaudio, qtmultimedia, re2-next, snappy, valgrind/pinned,
vulkan-headers, xcb-util, and xkeyboard-config.
[propagated-inputs]: Add qtbase, qtdeclarative, and qtwebchannel.
[native-inputs]: Add bison, clang-20, flex, gperf, lld-as-ld-wrapper-18,
ninja, node-lts, perl, pkg-config, python-beautifulsoup4,
python-html5lib, python-wrapper, and ruby.

Change-Id: I571936b320121b2c149da82f7777c42c63e959ed
patch browse .tar.gz 
1 files changed, 65 insertions(+), 18 deletions(-)

M gnu/packages/qt.scm

M gnu/packages/qt.scm => gnu/packages/qt.scm +65 -18
@@ 4125,26 4125,73 @@ linux/libcurl_wrapper.h"
              (delete-file-recursively
               (string-append #$output "/tests")))))))
    (native-inputs
     (modify-inputs (package-native-inputs qtwebengine-5)
       (delete "python2" "python2-six")
       (replace "node" node-lts)
       (append clang-20
               lld-as-ld-wrapper-18
               python-wrapper
               python-beautifulsoup4
               python-html5lib)))
     (list bison
           clang-20
           flex
           gperf
           lld-as-ld-wrapper-18
           ninja
           node-lts
           perl
           pkg-config
           python-beautifulsoup4
           python-html5lib
           python-wrapper
           ruby))
    (inputs
     (modify-inputs (package-inputs qtwebengine-5)
       (replace "ffmpeg" ffmpeg)
       (replace "icu4c" icu4c)
       (replace "re2" re2-next)
       (replace "qtmultimedia" qtmultimedia)
       (append fxdiv libxkbfile xkeyboard-config)))
     (list alsa-lib
           at-spi2-core
           cups-minimal
           curl
           dbus
           eudev
           ffmpeg
           fontconfig
           fxdiv
           harfbuzz
           icu4c
           jsoncpp
           lcms
           libcap
           libevent
           libgcrypt
           libjpeg-turbo
           libvpx
           libwebp
           libx11
           libxcb
           libxcomposite
           libxcursor
           libxi
           libxkbcommon
           libxkbfile
           ;; FIXME: libxml2 needs to built with icu support though it links to
           ;; libxml2 configure summary still states "Checking for compatible
           ;; system libxml2... no"
           libxml2
           libxrandr
           libxrender
           libxslt
           libxtst
           mesa
           minizip
           nss
           openh264
           opus
           pciutils
           protobuf
           pulseaudio
           qtmultimedia
           re2-next
           snappy
           valgrind/pinned
           vulkan-headers
           xcb-util
           xkeyboard-config))
    (propagated-inputs
     (modify-inputs (package-propagated-inputs qtwebengine-5)
       (replace "qtbase" qtbase)
       (replace "qtdeclarative" qtdeclarative)
       (replace "qtwebchannel" qtwebchannel)))
     (list qtbase
           qtdeclarative
           qtwebchannel))
    (home-page "https://wiki.qt.io/QtWebEngine")
    (synopsis "Qt WebEngine module")
    (description "The Qt WebEngine module provides support for web