3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

23 commits

Author SHA1 Message Date
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
Vladimír Čunát 17faab35c3 qt48: minor update 2013-02-13 12:31:17 +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 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 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