Commit Graph

18 Commits

Author SHA1 Message Date
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
Robin Gloster
8a244db9f3
libsForQt5.qtspeech: enable 2018-03-24 12:07:52 +01: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
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
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
Bastian Köcher
5abf6ef5a8 qt5: 5.10.0 -> 5.10.1 2018-02-15 08:54:29 +01:00
Daiderd Jordan
a93b1ea803
qt510-qtbase: fix darwin build with clang-5 2018-02-12 22:15:04 +01:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null 2018-01-20 09:10:57 -06:00
Daiderd Jordan
62633d0605
qt510-qtbase: fix darwin build
Includes most of the changes from 3793320958,
moved it to a separate patch to avoid accidental removal.
2018-01-17 22:07:35 +01:00
Thomas Tuegel
75d2a7dc4d
qt5: reduce closure size
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.

Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
2018-01-15 18:48:37 -06:00
Daiderd Jordan
3793320958
qt5-qtbase: update darwin patch 2018-01-09 22:47:34 +01:00
Bastian Köcher
e5b1a5724e Qt5: 5.9.3 -> 5.10.0 2018-01-02 14:01:37 +01:00