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

falkon: enable qtwayland #49806

Merged
merged 1 commit into from Nov 10, 2018
Merged

Conversation

colemickens
Copy link
Member

Motivation for this change

Enable wayland support in falkon.

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)
  • Fits CONTRIBUTING.md.

@@ -21,8 +24,8 @@ stdenv.mkDerivation rec {

buildInputs = [
libpthreadstubs libxcb libXdmcp
qtsvg qttools qtwebengine qtx11extras qtwayland
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should just be added on stdenv.isLinux

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks. I changed this, but it doesn't seem to be activating on my system, despite me running NixOS on an x64 processor? Or I didn't add it correctly, but I followed the pattern I saw in other files.

kwallet
qtsvg qtwebengine qtx11extras
];
] ++ lib.optional stdenv.isLinux [ qtwayland ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
] ++ lib.optional stdenv.isLinux [ qtwayland ];
] ++ lib.optionals stdenv.isLinux [ qtwayland ];

or

Suggested change
] ++ lib.optional stdenv.isLinux [ qtwayland ];
] ++ lib.optional stdenv.isLinux qtwayland;

@colemickens
Copy link
Member Author

Thanks @matthewbauer @Mic92. Comments addressed, working as intended.

@Mic92
Copy link
Member

Mic92 commented Nov 6, 2018

@GrahamcOfBorg build falkon

@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: falkon

Partial log (click to expand)

shrinking /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/lib/qt-5.11/plugins/falkon/KWalletPasswords.so
shrinking /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/lib/qt-5.11/plugins/falkon/ImageFinder.so
shrinking /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/lib/libFalkonPrivate.so.3.0.1
shrinking /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/bin/falkon
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/lib  /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1/bin
patching script interpreter paths in /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1
checking for references to /build in /nix/store/s95i0n1zrpgbi1vvw7glryjp720wkzds-falkon-3.0.1...
postPatchMkspecs
postPatchMkspecs

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: falkon

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Failure on aarch64-linux (full log)

Attempted: falkon

Partial log (click to expand)

make[3]: *** [Makefile.gn_run:336: run_ninja] Error 1
make[3]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src/core'
make[2]: *** [Makefile:80: sub-gn_run-pro-make_first] Error 2
make[2]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src/core'
make[1]: *** [Makefile:79: sub-core-make_first] Error 2
make[1]: Leaving directory '/build/qtwebengine-everywhere-src-5.11.1/src'
make: *** [Makefile:47: sub-src-make_first] Error 2
builder for '/nix/store/ls9pcq6m945qkqy417sh79ynix1d9q57-qtwebengine-5.11.1.drv' failed with exit code 2
cannot build derivation '/nix/store/iz27aagagsnl9v5j6aaryqc8i4mspscn-falkon-3.0.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/iz27aagagsnl9v5j6aaryqc8i4mspscn-falkon-3.0.1.drv' failed

@samueldr
Copy link
Member

[23:39:34] It would be nice to ask ofborg to build the current version of a package. I have a PR and it doesn't build for aarch64, and I don't know if it's because of my change or because it has never built for aarch64.

builder for '/nix/store/ls9pcq6m945qkqy417sh79ynix1d9q57-qtwebengine-5.11.1.drv' failed with exit code 2
cannot build derivation '/nix/store/iz27aagagsnl9v5j6aaryqc8i4mspscn-falkon-3.0.1.drv': 1 dependencies couldn't be built
error: build of '/nix/store/iz27aagagsnl9v5j6aaryqc8i4mspscn-falkon-3.0.1.drv' failed

Looks like there's no issues with falkon right now. The issue seems to be with qtwebengine. Not sure what the actual issue is though. What follows is not relevant to your PR.

ninja: build stopped: subcommand failed.

and earlier

[14012/16390] CXX obj/third_party/WebKit/Source/bindings/core/v8/bindings_core_impl/bindings_core_impl_jumbo_19.o
FAILED: obj/third_party/WebKit/Source/bindings/core/v8/bindings_core_impl/bindings_core_impl_jumbo_19.o
/nix/store/klgxdd526njckk7cq8j1pxakb2p6wv70-gcc-wrapper-7.3.0/bin/g++ -MMD -MF obj/third_party/WebKit/Source/bindings/core/v8/bindings_core_impl/bindings_core_impl_jumbo_19.o.d -DV8_DEPRECATION_WARNINGS -DUSE_UDEV -DUSE_AURA=1 -DUSE_GLIB=1 -DUSE_NSS_CERTS=1 -DUSE_X11=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DFIELDTRIAL_TESTING_ENABLED -DTOOLKIT_QT -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DBLINK_CORE_IMPLEMENTATION=1 -DGLIB_VERSION_MAX_ALLOWED=GLIB_VERSION_2_32 -DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_26 -DGL_GLEXT_PROTOTYPES -DUSE_GLX -DUSE_EGL -DBLINK_IMPLEMENTATION=1 -DINSIDE_BLINK -DU_USING_ICU_NAMESPACE=0 -DU_ENABLE_DYLOAD=0 -DU_STATIC_IMPLEMENTATION -DICU_UTIL_DATA_IMPL=ICU_UTIL_DATA_FILE -DUCHAR_TYPE=uint16_t -DGOOGLE_PROTOBUF_NO_RTTI -DGOOGLE_PROTOBUF_NO_STATIC_INITIALIZER -DHAVE_PTHREAD -DSK_IGNORE_LINEONLY_AA_CONVEX_PATH_OPTS -DSK_HAS_PNG_LIBRARY -DSK_HAS_WEBP_LIBRARY -DSK_HAS_JPEG_LIBRARY -DSK_SUPPORT_GPU=1 -DWTF_USE_WEBAUDIO_FFMPEG=1 -DWTF_USE_DEFAULT_RENDER_THEME=1 -DLEVELDB_PLATFORM_CHROMIUM=1 -DUSE_SYSTEM_LIBJPEG -DLIBXSLT_STATIC -DUSE_SYSTEM_ZLIB=1 -I. -Igen -I../../3rdparty/chromium -I../../3rdparty/chromium/third_party/WebKit/Source -I../../3rdparty/chromium/third_party/WebKit -Igen/blink -Igen/third_party/WebKit -I/nix/store/lfqn0va9pcmj3ga25ifsnwk6zhb2czdd-glib-2.56.0-dev/include/glib-2.0 -I/nix/store/hqq3pvy2jgsf11s6dp7h6zsgri6q9723-glib-2.56.0/lib/glib-2.0/include -Igen -Igen -Igen -I../../3rdparty/chromium/third_party/khronos -I../../3rdparty/chromium/gpu -I../../3rdparty/chromium/third_party/libyuv/include -Igen -Igen -Igen -Igen -Igen -Igen -I../../3rdparty/chromium/third_party/WebKit/Source -Igen/blink -I../../3rdparty/chromium/third_party/ced/src -I../../3rdparty/chromium/third_party/icu/source/common -I../../3rdparty/chromium/third_party/icu/source/i18n -I../../3rdparty/chromium/third_party/protobuf/src -I../../3rdparty/chromium/third_party/protobuf/src -Igen/protoc_out -I../../3rdparty/chromium/third_party/boringssl/src/include -I/nix/store/97dcvq0b2dnvxhy857csw1fp4m533m8d-nss-3.39-dev/include/nss -I/nix/store/lhsbi2vhfayl3lbnyy3yn74w2jdnmc0g-nspr-4.20-dev/include -I../../3rdparty/chromium/skia/config -I../../3rdparty/chromium/skia/ext -I../../3rdparty/chromium/third_party/skia/include/c -I../../3rdparty/chromium/third_party/skia/include/config -I../../3rdparty/chromium/third_party/skia/include/core -I../../3rdparty/chromium/third_party/skia/include/effects -I../../3rdparty/chromium/third_party/skia/include/encode -I../../3rdparty/chromium/third_party/skia/include/gpu -I../../3rdparty/chromium/third_party/skia/include/images -I../../3rdparty/chromium/third_party/skia/include/lazy -I../../3rdparty/chromium/third_party/skia/include/pathops -I../../3rdparty/chromium/third_party/skia/include/pdf -I../../3rdparty/chromium/third_party/skia/include/pipe -I../../3rdparty/chromium/third_party/skia/include/ports -I../../3rdparty/chromium/third_party/skia/include/utils -I../../3rdparty/chromium/third_party/vulkan/include -I../../3rdparty/chromium/third_party/skia/src/gpu -I../../3rdparty/chromium/third_party/skia/src/sksl -I../../3rdparty/chromium/third_party/libwebm/source -I../../3rdparty/chromium/third_party/leveldatabase -I../../3rdparty/chromium/third_party/leveldatabase/src -I../../3rdparty/chromium/third_party/leveldatabase/src/include -I../../3rdparty/chromium/third_party/WebKit -Igen/third_party/WebKit -I../../3rdparty/chromium/v8/include -Igen/v8/include -I../../3rdparty/chromium/third_party/iccjpeg -I/nix/store/8ic96xw2pv5bld24wzck7iw8a7cg7l7x-zlib-1.2.11-dev/include -I/nix/store/70s80dpzbng51rlc4wbzl14sgwiwsx37-libpng-apng-1.6.34-dev/include/libpng16 -I/nix/store/szvmhyrca143i7svz1l3j9h8v3797211-libwebp-1.0.0/include -I../../3rdparty/chromium/third_party/ots/include -I../../3rdparty/chromium/v8/include -Igen/v8/include -I../../3rdparty/chromium/third_party/angle/include -I../../3rdparty/chromium/third_party/angle/src/common/third_party/base -Igen/angle -I../../3rdparty/chromium/third_party/libxml/src/include -I../../3rdparty/chromium/third_party/libxml/linux/include -I../../3rdparty/chromium/third_party/libxslt/src -fno-strict-aliasing --param=ssp-buffer-size=4 -fstack-protector -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -funwind-tables -fPIC -pipe -pthread -Wall -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wno-unused-local-typedefs -Wno-maybe-uninitialized -Wno-deprecated-declarations -fno-delete-null-pointer-checks -Wno-missing-field-initializers -Wno-unused-parameter -O2 -fno-ident -fdata-sections -ffunction-sections -fno-omit-frame-pointer -fvisibility=hidden -g0 -DLIBXML_STATIC= -std=gnu++14 -fno-delete-null-pointer-checks -Wno-narrowing -fno-exceptions -fno-rtti -fvisibility-inlines-hidden -c gen/gen/blink/bindings/core/v8/bindings_core_impl_jumbo_19.cc -o obj/third_party/WebKit/Source/bindings/core/v8/bindings_core_impl/bindings_core_impl_jumbo_19.o
{standard input}: Assembler messages:
{standard input}:377303: Warning: end of file not at end of a line; newline inserted
{standard input}:377361: Error: operand 1 must be an integer register -- `str'
{standard input}: Error: open CFI at the end of file; missing .cfi_endproc directive
g++: internal compiler error: Killed (program cc1plus)
Please submit a full bug report,

@samueldr
Copy link
Member

@GrahamcOfBorg build falkon

Hopefully, a bit fewer dependencies to build, and better luck in the qtwebengine build, if it was some bad luck that caused the failure.

@GrahamcOfBorg
Copy link

No attempt on x86_64-darwin (full log)

The following builds were skipped because they don't evaluate on x86_64-darwin: falkon

Partial log (click to expand)


a) For `nixos-rebuild` you can set
  { nixpkgs.config.allowUnsupportedSystem = true; }
in configuration.nix to override this.

b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add
  { allowUnsupportedSystem = true; }
to ~/.config/nixpkgs/config.nix.


@GrahamcOfBorg
Copy link

Success on x86_64-linux (full log)

Attempted: falkon

Partial log (click to expand)

shrinking /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/lib/qt-5.11/plugins/falkon/StatusBarIcons.so
shrinking /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/lib/qt-5.11/plugins/falkon/AutoScroll.so
shrinking /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/lib/qt-5.11/plugins/falkon/TabManager.so
shrinking /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/lib/qt-5.11/plugins/falkon/KWalletPasswords.so
strip is /nix/store/vcc4svb8gy29g4pam2zja6llkbcwsyiq-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/lib  /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1/bin
patching script interpreter paths in /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1
checking for references to /build in /nix/store/086ddlblh7b05mfxvprv9b2ss29ycgln-falkon-3.0.1...
postPatchMkspecs
postPatchMkspecs

@GrahamcOfBorg
Copy link

Success on aarch64-linux (full log)

Attempted: falkon

Partial log (click to expand)

shrinking /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1/lib/qt-5.11/plugins/falkon/FlashCookieManager.so
shrinking /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1/lib/qt-5.11/plugins/falkon/AutoScroll.so
shrinking /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1/lib/libFalkonPrivate.so.3.0.1
strip is /nix/store/p9akxn2sfy4wkhqdqa3li97pc6jaz3r1-binutils-2.30/bin/strip
stripping (with command strip and flags -S) in /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1/lib  /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1/bin
patching script interpreter paths in /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1
checking for references to /build in /nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1...
postPatchMkspecs
postPatchMkspecs
/nix/store/f39gwg6ysh3kdc7iv4mgvp1mb36lzqkk-falkon-3.0.1

@colemickens
Copy link
Member Author

Thanks for the info and nudging the bot, @samueldr !

@infinisil infinisil merged commit bed0e8b into NixOS:master Nov 10, 2018
@colemickens colemickens deleted the falkon-qtwayland branch November 13, 2018 11:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants