Commit graph

481 commits

Author SHA1 Message Date
Alyssa Ross 1c70685fdb
qt59.qtwebkit: fix build on Darwin
Why is qtmultimedia only needed on Darwin? Why does it only fix 5.9, not
5.11? These things I do not know. What I do know is that, for some
reason, this makes qt59.qtwebkit build on Darwin.

I think the reason it hasn't also fixed 5.11 might be something to do
with the version of qtmultimedia, but I don't know enough about Qt or
cmake to figure it out. The error when trying to build qt511.qtwebkit
(with or without these changes) is:

    CMake Error at Source/cmake/OptionsQt.cmake:739 (find_package):
      Could not find a package configuration file provided by "Qt5Multimedia"
      (requested version 5.2.0) with any of the following names:

        Qt5MultimediaConfig.cmake
        qt5multimedia-config.cmake

      Add the installation prefix of "Qt5Multimedia" to CMAKE_PREFIX_PATH or set
      "Qt5Multimedia_DIR" to a directory containing one of the above files.  If
      "Qt5Multimedia" provides a separate development package or SDK, be sure it
      has been installed.
    Call Stack (most recent call first):
      Source/cmake/WebKitCommon.cmake:50 (include)
      CMakeLists.txt:137 (include)

    -- Configuring incomplete, errors occurred!
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
2018-10-19 10:36:48 +01:00
Eelco Dolstra 9bbd4f653f
qtgraphicaleffects: Add dev output
This shrank my system closure by about 192 MiB.
2018-10-08 16:32:27 +02:00
xeji c2c9c6adfe
Merge pull request #46385 from xeji/p/broken
mark long-failing packages broken for 18.09
2018-09-15 00:54:49 +02:00
Uli Baum 83e5bbfb58 qt56.qtwebengine: mark as broken
- no successful build since 2018-04-25
- not used in nixpkgs anymore
2018-09-13 12:28:18 +02:00
Samuel Dionne-Riel cb380983ed qt5.qtwebkit: Fixes modules src being subtly broken.
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
2018-09-08 14:20:23 -04:00
Tom Hall ec334d38d2 qtwebengine: Fix inputs on aarch64
A mistake in the previous commit meant that ffmpeg wasn't added to the
propagatedBuildInputs on aarch64.
2018-08-26 12:41:54 +01:00
Thomas Tuegel b74dc6f0f0
Merge pull request #45122 from Thra11/qtwebengine-aarch64
qtwebengine: Use system ffmpeg on aarch64
2018-08-25 07:20:05 -05:00
Tom Hall e01c61347e qtwebengine: Use system ffmpeg on aarch64
On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg
as a dependency and passing -system-ffmpeg to qmake fixes this.

Slightly odd conditional in qmakeFlags to avoid altering the list on
non-arm platforms, so that the change doesn't trigger an unneccessary
rebuild.
2018-08-24 12:37:57 +01:00
Vladimír Čunát 765d695b89
Merge branch 'staging-next'
Security fixes for a few packages are included.
2018-08-21 15:36:02 +02:00
Matthew Bauer 4826f9b828 qtwebengine: remove old darwin patch
file apparently doesn’t exist anymore
2018-08-20 20:49:25 -05:00
Jan Malakhovski 875b48e3ea qt5.qtwebkit: disable tests 2018-08-11 09:35:36 +00:00
Jan Malakhovski 9cbddc6955 qt5.qtwebkit.hyphen: fix tests 2018-08-11 09:35:19 +00:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Orivej Desh bbca5042ac qt511.qtbase: fix darwin build
Qt 5.11.1 replaced one occurrence of NSMouseMoved with NSEventTypeMouseMoved:
da32360ffc.

It is not available in AppKit from macOS 10.10, therefore this change restores
NSMouseMoved: https://developer.apple.com/documentation/appkit/nsmousemoved

Closes #43258
2018-07-10 15:27:17 +00:00
averelld 1999d279ec qt5: 5.11.0 -> 5.11.1 (#42351)
This may be needed to unbreak a couple of builds such as nextcloud clients or rstudio: codereview.qt-project.org/#/c/232367
2018-07-05 02:37:48 +00:00
Daiderd Jordan 738df73f2a qt5: update darwin patch for 5.11 2018-06-12 14:27:11 +02:00
Daiderd Jordan 4ed62d6b88 qt5: revert qtbase commit that removes macOS 10.10 code paths
We use MACOSX_DEPLOYMENT_TARGET=10.10 in nixpkgs and some darwin
packages like CoreFoundation are based on the 10.10 sources from
opensource.apple.com.
2018-06-12 14:27:11 +02:00
Bastian Köcher b785d4813e qt5: 5.10 -> 5.11
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
2018-06-12 14:27:11 +02:00
Matthew Justin Bauer 4ae5f8a92a
qt: remove install_name_tool stuff
hopefully it's not needed - the frameworks are no longer there
2018-06-02 23:07:12 -04:00
Matthew Bauer dcea0913e5 qt: fixup from c4cac55d69
This commit was too aggressive in adding configure flags. Only qtbsea
needs the -no-framework flag to work correctly. Qmake will handle
everything else for us.
2018-06-02 13:50:45 -04:00
Orivej Desh 50c82704a8 qt5.qtlocation: enable parallel building
It was fixed in [1] which is part of 5.9.2, 5.10.0.

[1] 3ac051c454 (diff-b820e0828543b1da522ff0ab3dac6c75)
2018-05-29 13:41:23 +00:00
Thomas Tuegel db215a62b7
qtwebengine: fix build failure due to -Wformat-security
ninja builds some components with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
2018-05-25 20:14:05 -05:00
Will Dietz 39696b6d56 qt-5.10: don't use features that require new-ish kernels, stay compat
Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]
2018-05-18 03:51:20 +03:00
Matthew Bauer c4cac55d69 qt510: disable framework build on macOS
We prefer to have $out/include & $out/lib installed so that things
like multiple outputs can work. There is no way to do this in Qt
currently without also disabling the ‘framework’ install. Not sure if
this will break anything but it will fix issues we run into on some
projects like python2.7-pyside:

Linux: https://hydra.nixos.org/build/73219181
macOS: https://hydra.nixos.org/build/73059550

Hopefully this gives us consistency between the two.
2018-05-08 15:46:57 -05:00
Josef Kemetmüller 472f21951a qt5.qtwebkit: Reduce log size to fix hydra build
This should fix the darwin build of qtwebkit.
2018-05-06 18:44:31 +02:00
Matthew Bauer ec632b745f qtwebengine: rewrite
Fixes #39334
and Fixes #36729

Also, Fixes #36932 (hopefully it's still building)

(This might be able to be able to be cherry-picked to 18.03 but be
careful - chromium is extremely touchy. Probably best to wait for it
to be built successfully on Hydra a few times.)
2018-04-24 23:57:46 -05:00
Shea Levy 05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Corey O'Connor 807a308623 qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn driven ninja. 2018-03-26 12:32:46 -07:00
Nikolay Amiantov a5b2e0277a qt5.qtwebengine: fix build 2018-03-26 14:01:49 +03:00
Robin Gloster 8a244db9f3
libsForQt5.qtspeech: enable 2018-03-24 12:07:52 +01:00
Tuomas Tynkkynen ef64208eba Merge commit '3ab2949' from staging into master
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
2018-03-15 22:30:56 +02:00
Daiderd Jordan ecbb9027ea
Merge pull request #36847 from badi/qtlocation
qtlocation: fix darwin build
2018-03-14 00:14:53 +01:00
Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
2018-03-13 23:04:18 +02:00
volth 7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
John Ericson dde80d705e qtbase: Fix x86_64-conditional logic
Now works with cross and old and new meta checks alike.
2018-03-12 18:55:41 -04:00
Badi Abdul-Wahid 833851cd6e
qtlocation: fix darwin build
A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
2018-03-12 02:04:28 -04:00
Jan Malakhovski 7079e744d4 Merge branch 'master' into staging
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
2018-03-10 20:38:13 +00:00
Vladimír Čunát 565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Matthew Bauer 4e207ba1df
qt5: install headers on darwin also 2018-02-28 22:37:35 +01:00
Daiderd Jordan b4cf3f7909
Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig
qt5: install pkg_config files on darwin
2018-02-27 00:05:56 +01:00
adisbladis 0e086dd1c1
Merge pull request #34993 from bkchr/qt_5_10_1
qt5: 5.10.0 -> 5.10.1
2018-02-26 03:43:02 +08:00
Alexander V. Nikolaev e94cd63bf5 treewide: transition libGL/libGLU for qt
Also rename mesaSupported to libGLSupported
2018-02-24 17:06:49 +02:00
Matthew Bauer a98a767695 qt5: install pkg_config files on darwin
Fixes #31685

This patch is applied in Homebrew here and looks to have worked for
them:

fafbdbd237/Formula/qt.rb (L33-L44)

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
2018-02-22 11:21:59 -06:00
Shea Levy 32ce7012f0
Merge branch 'master' into gcc-7 2018-02-18 16:27:22 -05:00
Bjørn Forsman 09cf3506fa qt5X.full: add "-full" to package name
This aligns the package name more with the attrname.

This is a re-application of the idea behind 7405af72e6
("qt: make package names of "full" variants appear as such"), which
seems to have been lost on the way.
2018-02-18 14:44:16 +01:00
Nikolay Amiantov 44901407f0 qtEnv: fix paths in qt.conf
The shell variables from setup hook are not visible here, so instead substitute
them from Nix side.
2018-02-18 14:44:16 +01:00
Bjørn Forsman 7ab180999b qt510.full: add missing modules
Specifically: qtquickcontrols2, qtvirtualkeyboard, qtwebchannel,
qtwebengine, qtwebkit.

This fixes a regression since qt56.full.
2018-02-18 12:58:26 +01:00
Bjørn Forsman 23cdc3224a qt59.full: add missing modules
Specifically: qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

This fixes a regression since qt56.full.
2018-02-18 12:58:26 +01:00
Vladimír Čunát d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra
Before > 64 MiB, now ~25 MiB.
2018-02-17 09:45:38 +01:00
Bastian Köcher 5abf6ef5a8 qt5: 5.10.0 -> 5.10.1 2018-02-15 08:54:29 +01:00