Commit Graph

455 Commits

Author SHA1 Message Date
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
Daiderd Jordan
0bf153f9c0
qt59-qtbase: fix darwin build with clang-5 2018-02-12 22:50:36 +01:00
Daiderd Jordan
a93b1ea803
qt510-qtbase: fix darwin build with clang-5 2018-02-12 22:15:04 +01:00
Daiderd Jordan
0905e5e23a
qt59-qtbase: fix darwin build 2018-02-10 20:30:38 +01:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null 2018-01-20 09:10:57 -06:00
Thomas Tuegel
c1720b412b
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.

See also: #34039 #34038 #33935 #33933 #33930 #33927
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
5783980fc6
qtbase: fix evaluation error
`git rebase` strikes again!
2018-01-15 19:12:01 -06:00
Thomas Tuegel
04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0 2018-01-15 18:49:27 -06:00
Thomas Tuegel
617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0 2018-01-15 18:49:13 -06: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
Will Dietz
42b84057a4 qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait
Based on:
4e8083b4ab

Fixes mendeley bug mentioned in #33396,
which links to related issues in other distributions and upstream Qt.
2018-01-04 13:08:51 -06:00
Bastian Köcher
e5b1a5724e Qt5: 5.9.3 -> 5.10.0 2018-01-02 14:01:37 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant
Make cross compilation elegant
2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d treewide: Don't use envHook anymore
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
2017-12-30 22:04:22 -05:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging
Hydra: ?compare=1421760
2017-12-29 10:13:33 +01:00
Robin Gloster
9359050ae2 mariadb: more lib -> connector-c 2017-12-29 02:18:35 +01:00
adisbladis
907face464
qt5: Add qtvirtualkeyboard submodule 2017-12-28 21:13:45 +08:00
Orivej Desh
fb349c84e2 qt5.qttools: install macdeployqt on darwin 2017-12-20 08:56:54 +00:00
Thomas Tuegel
145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3""
This reverts commit a1b77bfe5f.

KDE Frameworks are updated to version 5.41.0 which is compatible with Qt 5.9.3.
2017-12-11 11:32:16 -06:00
Orivej Desh
f568450637 qmake: enable parallel building of qmake projects by default 2017-12-07 08:52:42 +00:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files
stdenv setup: Always use both propagated files
2017-11-22 15:23:37 -05:00
John Ericson
da19c34d0f stdenv setup: Always use both propagated files
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
2017-11-21 10:44:44 -05:00
Orivej Desh
031367af2b qt56.qtwebengine: fix build
Delete the patch, it has been integrated into Qt 5.6.3.
2017-11-17 02:51:58 +00:00
Thomas Tuegel
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build 2017-11-12 09:51:48 -06:00
Thomas Tuegel
ded18e4f47
qt59.qtbase: restore Darwin collection-types patch 2017-11-12 09:51:48 -06:00