Commit Graph

133 Commits

Author SHA1 Message Date
janus
55aa9163cc FreeBSD: minor fixes, add notes and make stdenv more robust 2016-01-01 17:01:13 +00:00
Vladimír Čunát
f9f6f41bff Merge branch 'master' into closure-size
TODO: there was more significant refactoring of qtbase and plasma 5.5
on master, and I'm deferring pointing to correct outputs to later.
2015-12-31 09:53:02 +01:00
Robin Gloster
4b5cb62488 qt4: add patch to build with libressl 2.3 2015-12-23 22:08:33 +00:00
Vladimír Čunát
783c40eb68 dbus: split into multiple outputs and fix referrers 2015-10-13 20:19:01 +02:00
Vladimír Čunát
2e2d39f31a qt4: fix patching dlopen paths after multiple outputs
Also another leftover fix.
2015-10-13 20:18:58 +02:00
Vladimír Čunát
da9115128c qt4: disable parallel building again
There are still occasional problems on Hydra.
2015-06-10 09:16:53 +02:00
Vladimír Čunát
16b40c7b1f qt48: maintenance update, try enableParallelBuilding
I successfully built it with 8 free cores;
hopefully it won't give problems.

/cc maintainers: @lovek323, @phreedom, @sander.

I wonder that the build reports no support for gstreamer and pulseaudio.
I checked it was so before this commit, but it might still be useful
to enable those.

No more 4.8.x releases are planned. End of support is scheduled to Dec'15.
2015-05-26 20:06:53 +02:00
Spencer Whitt
3e2b774384 cimg, qt4, pdf2svg: enable on Darwin 2015-04-19 19:39:35 -04:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Vladimír Čunát
2e98616e02 qt4: apply a patch from (K)Ubuntu
Suggested by @ruediger on IRC.
2014-11-10 18:22:32 +01:00
Joel Taylor
6f949b2e87 get rid of nasty CC stuff 2014-09-09 13:54:26 -07:00
Vladimír Čunát
920a734a15 qt48: bugfix update 4.8.5 -> .6
Some patches dropped, as they seemed included.
2014-04-29 09:29:11 +02:00
aszlig
e64b342fa8
Use mingw-w64 for 32bit Windows builds as well.
Mingw(32) is rather poorly maintaned and has quite a lot of bugs. And
because our Windows cross builds were also poorly maintained and most of
the cross-tests were broken as well, I'm just taking this step and try
to switch to mingw-w64 for everything "cross Windows".

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
2014-03-03 22:38:48 +01:00
Vladimír Čunát
a84d2267d1 qt4: fix CVE-2013-4549.patch 2013-12-23 18:11:15 +01:00
Vladimír Čunát
619a1f5614 changes proposed for 13-10 update
One feature change: polkit update 8d14c7ba
2013-11-09 18:41:42 +01:00
Eelco Dolstra
58af4fb11e Update some more platforms 2013-11-06 10:58:20 +01:00
bbenoist
45851fc39a qtcreator: Make the qt package optional and introduce the QtSDK
To give the ability to use a different Qt version than the default one
(which can build 3 different times Qt Libraries if we mixed the default
one, the qtcreator one and the version including all the examples and the
docs).

Right now a developer can choose to directly install the QtSDK which
includes a "full" (developerBuild + docs + examples) Qt version and uses
it to build QtCreator.

The possibility to only install QtCreator and its previous behavior has
been kept for flexibility purposes (we do not need to force someone on the
SDK approach).
2013-10-21 09:36:45 +02:00
Jason \"Don\" O'Conal
19c72ae32c qt48: fix impurity on darwin.
Close #982.
2013-09-18 06:45:59 +03:00
Vladimír Čunát
76792f5a9d tarball: fix evaluation of qt on freebsd (mesa) 2013-08-23 09:13:51 +02:00
Vladimír Čunát
de5b992ecf qt, glew: propagate glu
After removing qt's dependency on the symlinked combination of mesa and glu,
many qt apps were missing it now (since e9f0d10).
I resove this to a compromise.
2013-08-06 10:37:15 +02:00
Vladimír Čunát
625f40151b Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/libraries/libpng/default.nix
	pkgs/tools/package-management/nixops/default.nix
	pkgs/top-level/all-packages.nix
2013-08-02 18:30:53 +02:00
Jason \"Don\" O'Conal
48a0d477db qt4: fix build on darwin (close #750) 2013-07-28 09:47:05 +02:00
Jason \"Don\" O'Conal
6fc89eead6 qt48: fix build on darwin
* build with clang
2013-07-12 16:26:47 +02:00
Vladimír Čunát
e9f0d1013d qt4: maintenance update 4.8.4 -> 4.8.5
Also fixed search path for libGL.
Tested building against master.
2013-07-04 15:29:23 +02:00
Vladimír Čunát
3cba755596 qt48: minimize default dependencies on non-Linux 2013-06-18 22:03:35 +02:00
Vladimír Čunát
92ecf99373 qt48, gstreamer: attempt to fix on non-Linux 2013-06-18 18:34:25 +02:00
Vladimír Čunát
a8f153267c qt48: security fix for CVE-2013-0254
Taken from Gentoo.
2013-06-18 13:57:15 +02:00
Vladimír Čunát
cba6d9b11a qt48: I give up, switching off parallel building
I was unable to find a reliable fix for the problems.
I seem to get either this http://hydra.nixos.org/build/5326327/nixlog/1/tail-reload
or that http://hydra.nixos.org/build/5297462/nixlog/1/tail-reload .
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch x-updates
# You are currently rebasing branch 'x-updates' on '81b7f5f'.
#   (all conflicts fixed: run "git rebase --continue")
#
# Changes to be committed:
#   (use "git reset HEAD <file>..." to unstage)
#
#	modified:   pkgs/development/libraries/qt-4.x/4.8/default.nix
#
# Untracked files:
#   (use "git add <file>..." to include in what will be committed)
#
#	core
#	dev.diff
#	pkgs/applications/networking/browsers/firefox/cairo-test.patch
#	pkgs/applications/video/flowblade/
#	pkgs/desktops/gnome-3/core/dconf/
#	pkgs/desktops/gnome-3/core/eog/
#	pkgs/desktops/gnome-3/core/libsecret/
#	pkgs/development/libraries/ncurses/builder.sh
#	pkgs/servers/x11/xorg/download-cache/
#	pkgs/servers/x11/xorg/still-missing.txt
2013-06-17 10:06:23 +02:00
Vladimír Čunát
fa6caedfea qt48: hopefully a version that works for all possibilities
All builds were OK on my 8-thread testing machine, but it's probably too
little parallelism to show these problems.
2013-06-13 19:18:34 +02:00
Vladimír Čunát
34f152e0d3 qt48: hopefully a good fix for parallel builds, finally
It caused rare failures, mainly for Qt for creator build.
2013-06-13 13:02:23 +02:00
Vladimír Čunát
f06f6955bd qt4: fix build via adding dependency in generated makefile
Also reorder attributes into the order in which they are run.
2013-06-10 09:35:35 +02:00
Vladimír Čunát
7af694700c Merge branch 'master' into x-updates
Silently merged badly the firefox 20/21 things. I got that, hopefully
there aren't more (my nixos-rebuild dry-run finds no more errors).
2013-06-05 12:59:47 +02:00
bbenoist
0c6e22adba qt: make docs, demos and examples optionnaly available
As the only option before was to don't include them at all.
2013-06-01 12:51:41 +02:00
Vladimír Čunát
ec3965d8d0 Revert Merge x-updates into master due to mesa bloat
See #490 discussion.

This reverts commit 1278859d31, reversing
changes made to 0c020c98f9.

Conflicts:
	pkgs/desktops/xfce/core/xfce4-session.nix (take master)
	pkgs/lib/misc.nix (auto)
2013-05-09 14:03:35 +02:00
Vladimír Čunát
1278859d31 Merge branch 'master' into x-updates
Conflicts (just splitting version from name):
	pkgs/os-specific/linux/systemd/default.nix
2013-05-08 13:46:46 +02:00
Evgeny Egorochkin
4ad55db0ad Adding myself as a maintainer of Qt and KDE 2013-05-07 09:57:10 +03:00
Evgeny Egorochkin
b8eaa5d3eb Qt4.8: upgrade to 4.8.4 2013-04-30 13:02:50 +03:00
Vladimír Čunát
6a29a56c12 qt4: parallel-build impurity fix
Modified to avoid unnecessary rebuilds.
2013-04-23 21:45:09 +02:00
Vladimír Čunát
0d72174dbd Merge branch stdenv-updates into x-updates
x-updates is supposed to merge after stdenv-updates, so let's test it

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix (both updated, taking newer)
	pkgs/development/libraries/mesa/default.nix (taking nativeBuildInputs)
2013-02-21 12:43:00 +01:00
Eelco Dolstra
2aa6f262cb Merge remote-tracking branch 'origin/master' into stdenv-updates 2013-02-15 13:36:34 +01:00
Vladimír Čunát
d65e07d679 qt47: remove, no longer used 2013-02-14 14:38:24 +01:00
Vladimír Čunát
17faab35c3 qt48: minor update 2013-02-13 12:31:17 +01:00
Vladimír Čunát
02ae3fdedd qt47: remove, no longer used 2013-02-13 10:37:37 +01:00
Eelco Dolstra
ab3eeabfed Rename buildNativeInputs -> nativeBuildInputs
Likewise for propagatedBuildNativeInputs, etc.  "buildNativeInputs"
sounds like an imperative rather than a noun phrase.
2012-12-28 19:20:09 +01:00
Baptist BENOIST
a40d115a62 qt-4.8: Add a developerBuild option
This option configures qmake with the -developer-build option.
For example, this tells Qt installer to also install Qt's private headers.
See http://doc.qt.digia.com/qt/configure-options.html for more.
2012-11-27 23:13:18 +01:00
Baptist BENOIST
e02c1630d1 Merge branch 'qtupdate' into master
It appeared that Eelco DOSTRA already made an update for it.
Unfortunately, his update was not complete as the dlopen-gtkstyle patch
didn't worked anymore.
This ommission can be explained by the fact there is (apparently) no usage
of the gtkstyle qt option in nixpkgs.
Also, and because Nokia abandonned Qt, I changed the homepage to match the
new url of Qt's open side (qt.digia.com is only for the commercial one).

Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-18 11:28:23 +02:00
Baptist BENOIST
39690a9904 qt: update to version 4.8.3
Signed-off-by: Baptist BENOIST <return_0@live.com>
2012-10-18 11:09:10 +02:00
Eelco Dolstra
bf1b2e9c2e qt4: Update to 4.8.3 2012-09-28 23:20:59 -04:00
Shea Levy
e821297f82 qt-4.8: Patch to build with glib-2.32 2012-07-14 23:09:14 -04:00
Ludovic Courtès
22da1866a7 Qt 4.8: Disable dependency on MESA when the platform doesn't support it.
svn path=/nixpkgs/trunk/; revision=34450
2012-06-11 09:31:43 +00:00
Karn Kallio
b81add3520 Change download location for qt everywhere 4.8.2; was not found.
svn path=/nixpkgs/trunk/; revision=34414
2012-06-10 00:51:46 +00:00
Yury G. Kudryashov
0d83120fd8 qt-4.8.2
svn path=/nixpkgs/trunk/; revision=34397
2012-06-09 13:09:16 +00:00
Lluís Batlle i Rossell
430b055516 Adding crossAttrs to cross-build qt with mingw32 and mingw64
svn path=/nixpkgs/trunk/; revision=34364
2012-06-05 21:21:21 +00:00
Yury G. Kudryashov
e1743e57be qt-4.8.1, kde-4.8.2
svn path=/nixpkgs/trunk/; revision=33621
2012-04-05 13:50:34 +00:00
Yury G. Kudryashov
e0b69cfc26 Let hydra build qt-4.8.1
svn path=/nixpkgs/trunk/; revision=33570
2012-04-04 16:07:47 +00:00
Yury G. Kudryashov
168a3d7101 Add qt4_for_skype
This build disables some optional features. I'm going to pass this to
skype_linux to reduce the size occupied by i686 packages on x86_64 system.

svn path=/nixpkgs/trunk/; revision=33217
2012-03-17 20:57:28 +00:00
Yury G. Kudryashov
fe1115caf4 Make nixpkgs ready for gst_all attrset removal
svn path=/nixpkgs/trunk/; revision=33092
2012-03-14 22:44:52 +00:00
Yury G. Kudryashov
e446dee4c3 Backport r32353 from stdenv-udpates
* Get rid of Qt 4.6.  It doesn't compile with GCC 4.6.  There was only
  one application still using it (Caneda), but upgrading it allowed it
  to build with Qt 4.7.

Eelco, could you please fix the date in caneda version?

svn path=/nixpkgs/trunk/; revision=32359
2012-02-17 17:40:58 +00:00
Yury G. Kudryashov
50fb545705 qt48: make "gtkStyle = true" work
svn path=/nixpkgs/trunk/; revision=31078
2011-12-25 16:22:36 +00:00
Yury G. Kudryashov
6b5dff3bb9 Qt-4.8.0
Hardcode paths to many dlopen()ed libraries. This should fix:
* Print dialog fails to find CUPS;
* flashplugin.
Add optional support for GTK style. Disabled by default.

svn path=/nixpkgs/trunk/; revision=31064
2011-12-24 21:52:08 +00:00
Yury G. Kudryashov
50531eacb8 qt-4.7.4
svn path=/nixpkgs/trunk/; revision=29557
2011-10-02 07:28:11 +00:00
Eelco Dolstra
c416926580 * Qt: remove Phonon since we can just use the external Phonon
package.  This also removes the GStreamer dependency because only
  Phonon uses it.

svn path=/nixpkgs/branches/kde-4.7/; revision=27814
2011-07-18 09:18:38 +00:00
Eelco Dolstra
3049b6788b * Doh, cmake doesn't extrapolate $(out).
svn path=/nixpkgs/branches/kde-4.7/; revision=27640
2011-07-07 19:56:01 +00:00
Eelco Dolstra
f62335822c * Qt 4.7.3.
svn path=/nixpkgs/branches/kde-4.7/; revision=27619
2011-07-07 12:13:16 +00:00
Yury G. Kudryashov
03b3d85fbf qt-4.7.2
svn path=/nixpkgs/trunk/; revision=26287
2011-03-12 06:59:49 +00:00
Sander van der Burg
0c4706f165 Bumped qt-4.7 to version 4.7.1
svn path=/nixpkgs/trunk/; revision=25820
2011-02-08 21:23:17 +00:00
Yury G. Kudryashov
eeda98a673 Remove qt-4.5
svn path=/nixpkgs/trunk/; revision=24991
2010-12-06 12:04:09 +00:00
Eelco Dolstra
1af46c1160 * Qt doesn't build on Darwin.
svn path=/nixpkgs/trunk/; revision=24807
2010-11-22 12:45:59 +00:00
Yury G. Kudryashov
23bd704530 qt-4.7.0
svn path=/nixpkgs/trunk/; revision=24024
2010-10-02 05:24:27 +00:00
Yury G. Kudryashov
83dac52cc9 qt-4.7.0-rc1
svn path=/nixpkgs/trunk/; revision=23624
2010-09-03 17:40:49 +00:00
Yury G. Kudryashov
a4829861ec Fix evaluation error
svn path=/nixpkgs/trunk/; revision=23103
2010-08-11 08:20:23 +00:00
Yury G. Kudryashov
7cecdce413 qt-4.7: add symlink for kde-4.5
svn path=/nixpkgs/trunk/; revision=23100
2010-08-10 20:18:51 +00:00
Peter Simons
1a6039cb45 Enable parallel building of gcc, glibc, gmp, mpfr, ncurses, coreutils, perl, python, git, and qt4.
If a build expressions has set "enableParallelBuilding = true", then the
generic builder may utilize more than one CPU core to build that particular
expression. This feature works out of the box for GNU Make. Expressions that
use other build drivers like Boost.Jam or SCons have to specify appropriate
flags such as "-j${NIX_BUILD_CORES}" themselves.

svn path=/nixpkgs/trunk/; revision=23042
2010-08-08 18:51:42 +00:00
Yury G. Kudryashov
aadea685af Restrict qt-4.7 to linux only
svn path=/nixpkgs/trunk/; revision=22909
2010-08-02 21:47:28 +00:00
Yury G. Kudryashov
230c31d020 Really make qt-4.7
svn path=/nixpkgs/trunk/; revision=22896
2010-08-02 17:18:56 +00:00
Yury G. Kudryashov
59a8bc0744 qt-4.7.0-beta2: fool phonon version
Qt guys updated source files but not version number

svn path=/nixpkgs/trunk/; revision=22833
2010-07-31 13:05:46 +00:00
Yury G. Kudryashov
d15fdc71f0 trailing spaces
svn path=/nixpkgs/trunk/; revision=22832
2010-07-31 13:05:22 +00:00
Yury G. Kudryashov
2835a98378 Add qt-4.7.0-beta2
svn path=/nixpkgs/trunk/; revision=22830
2010-07-30 19:45:07 +00:00
Yury G. Kudryashov
b39389560f Add meta.platforms to qt4 and merkaartor
Should fix one of hydra evaluation errors

svn path=/nixpkgs/trunk/; revision=22360
2010-06-21 17:06:08 +00:00
Armijn Hemel
1f9754bf07 update to 4.6.3, will let the buildfarm test
svn path=/nixpkgs/trunk/; revision=22185
2010-06-08 13:01:44 +00:00
Yury G. Kudryashov
169fee5644 Add qt-4.7-beta1 with low priority
svn path=/nixpkgs/trunk/; revision=21659
2010-05-07 20:08:37 +00:00
Yury G. Kudryashov
0864c1422e Move qt-4.x into subfolder
svn path=/nixpkgs/trunk/; revision=21658
2010-05-07 20:08:31 +00:00