Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add qtwebview to 5.11 and 5.12 packages #56577

Merged
merged 1 commit into from Mar 3, 2019

Conversation

Projects
None yet
5 participants
@PombeirP
Copy link
Contributor

commented Mar 1, 2019

Motivation for this change

Add the qtwebview module to the qt5.full package. Addresses #56579.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Assured whether relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@veprbl

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

I wonder how this can work on linux. Shouldn't it require qtwebengine there?

@PombeirP

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

I wonder how this can work on linux. Shouldn't it require qtwebengine there?

It does work, but that's a good question. When I was researching this, I've seen that qtwebengine is listed in the recommends section in this Conan recipe, so I figured I could leave it out. But I can add it to the PR.

@PombeirP

This comment has been minimized.

Copy link
Contributor Author

commented Mar 1, 2019

it also doesn't come up in the module's dependencies on Linux:

ldd /nix/store/b7244r5nyqf2pyg5m0dppc3sjy19v2hn-qtwebview-5.12.0/lib/libQt5WebView.so.5.12.0
        linux-vdso.so.1 (0x00007fff04d5e000)
        /usr/lib/x86_64-linux-gnu/libgtk3-nocsd.so.0 (0x00007f398b74b000)
        libQt5Gui.so.5 => /nix/store/b7244r5nyqf2pyg5m0dppc3sjy19v2hn-qtwebview-5.12.0/lib/../../s9nn8acnl8lpi01259yfjy2h5xvkin0c-qtbase-5.12.0/lib/libQt5Gui.so.5 (0x00007f398af8d000)
        libQt5Core.so.5 => /nix/store/b7244r5nyqf2pyg5m0dppc3sjy19v2hn-qtwebview-5.12.0/lib/../../s9nn8acnl8lpi01259yfjy2h5xvkin0c-qtbase-5.12.0/lib/libQt5Core.so.5 (0x00007f398a83c000)
        libpthread.so.0 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/libpthread.so.0 (0x00007f398a61d000)
        libQt5Quick.so.5 => /nix/store/737cdjwaj2ppx8n8ahlihh4sbbjlj6qy-qtdeclarative-5.12.0/lib/libQt5Quick.so.5 (0x00007f3989f6f000)
        libQt5Qml.so.5 => /nix/store/737cdjwaj2ppx8n8ahlihh4sbbjlj6qy-qtdeclarative-5.12.0/lib/libQt5Qml.so.5 (0x00007f39898cd000)
        libQt5Network.so.5 => /nix/store/b7244r5nyqf2pyg5m0dppc3sjy19v2hn-qtwebview-5.12.0/lib/../../s9nn8acnl8lpi01259yfjy2h5xvkin0c-qtbase-5.12.0/lib/libQt5Network.so.5 (0x00007f398952c000)
        libGL.so.1 => /nix/store/kj3qygsm3ay239gm23fs0wf0iqd9dqmc-libGL-1.0.0/lib/libGL.so.1 (0x00007f398929b000)
        libstdc++.so.6 => /nix/store/8c8wkbivmbn5cg2x0j5cr3vwfgdrxd88-gcc-7.4.0-lib/lib/libstdc++.so.6 (0x00007f3988f13000)
        libm.so.6 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/libm.so.6 (0x00007f3988b7e000)
        libgcc_s.so.1 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/libgcc_s.so.1 (0x00007f3988968000)
        libc.so.6 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/libc.so.6 (0x00007f39885b4000)
        libdl.so.2 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/libdl.so.2 (0x00007f39883b0000)
        libpng16.so.16 => /nix/store/favrxykk9bj0244rzsgdg5ycgf3wkbvk-libpng-apng-1.6.35/lib/libpng16.so.16 (0x00007f3988179000)
        libharfbuzz.so.0 => /nix/store/ywkg9333f64zcigp7hwc4dgkqs2blf74-harfbuzz-2.3.0/lib/libharfbuzz.so.0 (0x00007f3987e70000)
        libz.so.1 => /nix/store/w93d0agbvjgvixvgzx7dyn0g7rjg8yk8-zlib-1.2.11/lib/libz.so.1 (0x00007f3987c54000)
        libicui18n.so.59 => /nix/store/zx89klpfhcansgb9xjpi3nd14kbjh2wy-icu4c-59.1/lib/libicui18n.so.59 (0x00007f39877cf000)
        libicuuc.so.59 => /nix/store/zx89klpfhcansgb9xjpi3nd14kbjh2wy-icu4c-59.1/lib/libicuuc.so.59 (0x00007f398741b000)
        libicudata.so.59 => /nix/store/zx89klpfhcansgb9xjpi3nd14kbjh2wy-icu4c-59.1/lib/libicudata.so.59 (0x00007f3985908000)
        libpcre2-16.so.0 => /nix/store/z6yc6gz2sc18xwb9vrs0hkfsibm87b4l-pcre2-10.32/lib/libpcre2-16.so.0 (0x00007f398568d000)
        libgthread-2.0.so.0 => /nix/store/0vwqri2n4hdlg3j2d6vic8iiylah675a-glib-2.58.2/lib/libgthread-2.0.so.0 (0x00007f398548b000)
        libglib-2.0.so.0 => /nix/store/0vwqri2n4hdlg3j2d6vic8iiylah675a-glib-2.58.2/lib/libglib-2.0.so.0 (0x00007f398514c000)
        /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib64/ld-linux-x86-64.so.2 (0x00007f398bb69000)
        librt.so.1 => /nix/store/0fv2lnbr02qzh3l387rvd6vl8443mpq7-glibc-2.27/lib/librt.so.1 (0x00007f3984f44000)
        libssl.so.1.0.0 => /nix/store/zxi65ww7bws5lqlxgljq0p2j6pd4waiv-openssl-1.0.2q/lib/libssl.so.1.0.0 (0x00007f3984cd0000)
        libcrypto.so.1.0.0 => /nix/store/zxi65ww7bws5lqlxgljq0p2j6pd4waiv-openssl-1.0.2q/lib/libcrypto.so.1.0.0 (0x00007f3984867000)
        libGLX.so.0 => /nix/store/ph7m7sv0ylxg3hcb2h7q9zk0q1nll478-libglvnd-1.0.0/lib/libGLX.so.0 (0x00007f3984635000)
        libX11.so.6 => /nix/store/z9h0b414mvwlyvrjpwmxbl786bds8bld-libX11-1.6.7/lib/libX11.so.6 (0x00007f39842f4000)
        libXext.so.6 => /nix/store/90csbhkyi03ljwm6jglqwiiawkb9hvhg-libXext-1.3.3/lib/libXext.so.6 (0x00007f39840e1000)
        libGLdispatch.so.0 => /nix/store/ph7m7sv0ylxg3hcb2h7q9zk0q1nll478-libglvnd-1.0.0/lib/libGLdispatch.so.0 (0x00007f3983e2b000)
        libfreetype.so.6 => /nix/store/c0k9wmm2qmplm3zxblqb806lds0s0mnm-freetype-2.9.1/lib/libfreetype.so.6 (0x00007f3983b71000)
        libgraphite2.so.3 => /nix/store/97brqn3cfcfhbw2962nwppr8vsyrrm08-graphite2-1.3.6/lib/libgraphite2.so.3 (0x00007f398393e000)
        libpcre.so.1 => /nix/store/13a5pyzr2ys78nvcxm2axkkmf74mkb06-pcre-8.42/lib/libpcre.so.1 (0x00007f39836cc000)
        libxcb.so.1 => /nix/store/sny7j2spngd12km3mrl65bjk0iay0d3v-libxcb-1.13.1/lib/libxcb.so.1 (0x00007f39834a3000)
        libbz2.so.1 => /nix/store/hbwlz0p01w72f2nlmsxdyfh273bz8c3m-bzip2-1.0.6.0.1/lib/libbz2.so.1 (0x00007f3983293000)
        libXau.so.6 => /nix/store/s338syf4yxqryyfvdzpl9bmb0jx5da5r-libXau-1.0.8/lib/libXau.so.6 (0x00007f398308f000)
        libXdmcp.so.6 => /nix/store/fyib9s0qjyqnfshcgvs32py948fcc1p3-libXdmcp-1.1.2/lib/libXdmcp.so.6 (0x00007f3982e89000)
@matthewbauer

This comment has been minimized.

Copy link
Member

commented Mar 1, 2019

I think it will need qtwebengine to actually display something:

https://github.com/qt/qtwebview/blob/5.12/src/plugins/plugins.pro#L11

@PombeirP PombeirP force-pushed the status-im:qtwebview branch from 267a394 to 080612a Mar 2, 2019

@PombeirP

This comment has been minimized.

Copy link
Contributor Author

commented Mar 2, 2019

Added qtwebengine dependency to qtwebview.

@PombeirP PombeirP force-pushed the status-im:qtwebview branch from 9aeb38d to 080612a Mar 2, 2019

@FRidh FRidh merged commit f207bc5 into NixOS:master Mar 3, 2019

10 checks passed

grahamcofborg-eval ^.^!
Details
grahamcofborg-eval-check-maintainers matching changed paths to changed attrs...
Details
grahamcofborg-eval-check-meta config.nix: checkMeta = true
Details
grahamcofborg-eval-nixos-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A manual
Details
grahamcofborg-eval-nixos-options nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./nixos/release.nix -A options
Details
grahamcofborg-eval-nixpkgs-manual nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A manual
Details
grahamcofborg-eval-nixpkgs-tarball nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A tarball
Details
grahamcofborg-eval-nixpkgs-unstable-jobset nix-instantiate --arg nixpkgs { outPath=./.; revCount=999999; shortRev="ofborg"; } ./pkgs/top-level/release.nix -A unstable
Details
grahamcofborg-eval-package-list nix-env -qa --json --file .
Details
grahamcofborg-eval-package-list-no-aliases nix-env -qa --json --file . --arg config { allowAliases = false; }
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.