Commit Graph

30 Commits

Author SHA1 Message Date
Thomas Tuegel
b84f3e85d9 Fix QGtkStyle for Qt 5 versions 2015-05-19 11:37:21 -05:00
Thomas Tuegel
7094ae27da qt53: fix qtwebkit build with new glib 2015-05-13 12:49:14 -05:00
Ellis whitehead
bafde0fb6f patch Qt 5.4.1 to use XDG_CONFIG_DIRS in QSettings 2015-04-23 17:52:22 +02:00
Thomas Tuegel
88918e10e9 Merge branch 'master' into staging 2015-04-10 07:45:38 -05:00
Thomas Tuegel
74b2253ef8 qt54: remove obsolete qmake expression 2015-04-07 16:30:57 -05:00
Ambroz Bizjak
35fb8d9eb9 Qt 5.4.1: Make it build.
Looks like the original version update was incomplete. This sets the right
version attribute and fixes two patches which no longer apply.
2015-04-07 11:26:48 -05:00
Eric Seidel
6ec373d776 Merge branch master into staging 2015-04-06 18:58:08 -07:00
aszlig
8769f43aa4
qt-5.4: Fix reference to MySQL library.
The MySQL library has been split up from the main client/server binaries
in 53f1d8147d.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2015-04-02 13:31:35 +02:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Thomas Tuegel
5d1f6ad57c qt5: make qt-5.4.1 default 2015-03-24 17:14:56 -05:00
Thomas Tuegel
ad49ea230a qt54: update to qt-5.4.1 2015-03-24 17:14:56 -05:00
Thomas Tuegel
0cf073627c remove split qt-5.3 2015-02-21 11:39:19 -06:00
Thomas Tuegel
2e38240c95 add qt-5.4 2015-02-21 11:39:18 -06:00
Thomas Tuegel
042e4ad633 qt5split: add split submodule build of Qt 5.3 2015-02-07 12:52:20 -06:00
Thomas Tuegel
fa56e5ffa7 qt5: move monolithic build 2015-02-07 07:30:18 -06:00
Vladimír Čunát
dd4dfee2c2 qt5: work around a build problem 2014-12-26 22:03:05 +01:00
Shea Levy
05edd656f6 Missed gcc refs 2014-12-26 12:28:15 -05:00
Thomas Tuegel
b409bd7821 qt5: add ttuegel to maintainers 2014-12-03 05:24:24 -06:00
Thomas Tuegel
e36d7c8d11 qt5: absolute paths for dlopen 2014-12-03 05:22:51 -06:00
Thomas Tuegel
9168041813 Merge branch 'qt5-tzdir' into staging
Fixes a long-standing bug with Qt 5 and timezones on NixOS.
2014-11-20 12:00:48 -06:00
Thomas Tuegel
e2fe48756f qt5: find timezone table in $TZDIR 2014-11-20 11:14:15 -06:00
Thomas Tuegel
ad38cdac8a qt: upgrade to 5.3.2
This commit also removes the 5.2 branch in favor of 5.3. Several
components of KDE5 require Qt 5.3, so it doesn't make much sense to have
the rest of the system on an older version. Also, the application styles
may not be compatible because Qt breaks ABI compatibility between versions.
2014-11-20 11:10:06 -06:00
Jos van den Oever
01cc5a98d6 qt-5.3: update to 5.3.1 2014-08-23 11:44:33 +02:00
Bjørn Forsman
61121203c2 qt5: remove references to /usr/{share,lib}/X11/locale/
Qt5 currently hardcodes /usr/{share,lib}/X11/locale/. Fix it to use
paths from the nix store. Qt4 is unaffected.

This fixes a startup warning for applications built with qt5 (e.g.
qtcreator, shotcut):

  Qt Warning: Could not find a location of the system's Compose files. Consider setting the QTCOMPOSE environment variable.
2014-08-07 01:36:26 +02:00
Joachim Schiele
9d724820c3 added attrPath="qt53Full" and "attrPath="qt53"; qt-5.2 still default 2014-07-25 13:38:56 +02:00
Jos van den Oever
845b0e3ebc qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.
Close #2643.

Testing parallel build of qt5: fine on @vcunat's 8-core (just this single task).
We'll see on Hydra.
2014-06-11 21:30:21 +02:00
Eelco Dolstra
39f994cd60 qt-5: Prevent some unnecessary runtime dependencies
The file $out/mkspecs/qconfig.pri contains a list of all include /
library paths used during the build, including build-time-only
packages like GDB and Ruby. So get rid of those.
2014-05-24 12:37:05 +02:00
Eelco Dolstra
1cfea9bd1a qt-5: Don't build tests
Building the tests (which as far as I can tell we don't even run)
makes the build take > 19 GiB of disk space, which is a bit
excessive. Without the tests, it takes 2.6 GiB.
2014-05-24 12:37:05 +02:00
Vladimír Čunát
849b383f4d qt5: disable parallel building, as it often fails 2014-01-28 11:21:49 +01:00
bbenoist
90872e2b6c Add Qt 5.1.1 and its SDK
Consider this as a first step towards the integration of Qt5 into nixpkgs,
it does not yet intends to replace Qt4 on every packages even if possible.
My goal here is to have a first derivation in common between people who
needs qt5 for development purposes.

The derivation has been written from scratch but I took care to read at the
version 4 to re-integrate some patches which are still compatible. However,
I did not had enough time to test gtkStyle and flashplayerFix as I do not
use any of them. Also, OSX users will have to do some extra work because
I do not have any mac.

Finally, as some configure flags have changed and in an hope to provide a
clear package definition before it becomes mature, I voluntary added some
flags which are default. Once every option will be mastered, we will just
have to redo a pass on qt5 configure flags and remove the ones which are
set by default.
2013-10-21 09:36:45 +02:00