Commit Graph

109 Commits

Author SHA1 Message Date
Orivej Desh
6b4f0b5bf4 qt4: fix parallel building
qmake needs uic to extract dependency information from .ui files.  In -fast mode
qmake generates Makefiles for each subproject after the previous subproject is
built, and by the time it encounters subprojects with .ui files, uic is
available to provide dependency information.  In -no-fast mode qmake builds
subprojects in the same order, but generates all Makefiles beforehand, without
uic, and they miss dependencies.
2017-11-30 09:51:14 +00:00
Orivej Desh
c8d822252b qt4: delete parallel-build.patch to replace with a generic fix 2017-11-30 09:51:14 +00:00
Orivej Desh
a88146d308 qt4: fix parallel building of moc_qtgradientviewdialog.o
Previously the last of these commands:

```
make -j sub-tools-bootstrap
make -j sub-uic sub-moc sub-rcc
make -C tools/designer/src/lib .obj/release-shared/moc_qtgradientviewdialog.o
```

failed with this error:

```
In file included from .uic/release-shared/ui_qtgradientviewdialog.h:63:0,
                 from .moc/release-shared/../../../../../shared/qtgradienteditor/qtgradientviewdialog.h:47,
                 from .moc/release-shared/moc_qtgradientviewdialog.cpp:9:
../../../shared/qtgradienteditor/qtgradientview.h:47:31: fatal error: ui_qtgradientview.h: No such file or directory
```

because uic did not ensure that the build of moc_qtgradientviewdialog.o happens
after the build of moc_qtgradientview.o.
2017-11-29 09:08:44 +00:00
Orivej Desh
8b0ef2a564 qt4: enable parallel building in the configure phase 2017-11-29 09:06:42 +00:00
John Ericson
e755a8a27d treewide: Use targetPrefix instead of prefix for platform name prefixes
Certain tools, e.g. compilers, are customarily prefixed with the name of
their target platform so that multiple builds can be used at once
without clobbering each other on the PATH. I was using identifiers named
`prefix` for this purpose, but that conflicts with the standard use of
`prefix` to mean the directory where something is installed. To avoid
conflict and confusion, I renamed those to `targetPrefix`.
2017-11-27 03:15:50 -05:00
Orivej Desh
71a2a5ae40 qt4: enable parallel building
Please let me know if it fails to build in parallel so we could fix it, because
overwise it is a bottleneck of mass rebuilds.
2017-11-21 19:30:18 +00:00
Luke Adams
0aa6d90845 qt4: Override broken installPhase on Darwin 2017-10-10 17:08:34 -05:00
Tuomas Tynkkynen
bc850cfed5 qt4: Add aarch64 patch 2017-09-19 10:59:11 +03:00
Thomas Tuegel
9aa4f09008
qt4: unset LD
Commit 093cc00cdd sets the `LD' environment
variable by default, interfering with the Makefile which uses gcc for linking.
2017-07-21 16:49:32 -05:00
John Ericson
f16ee76ca8 qt 4.8: Don't use stdenv.cross 2017-06-28 18:31:37 -04:00
John Ericson
594d264205 cross stdenv adaptor: Support --host --build --target across the board
Packages get --host and --target by default, but can explicitly request
any subset to be passed as needed. See docs for more info.

rustc: Avoid hash breakage by using the old (ignored)
dontSetConfigureCross when not cross building
2017-06-22 17:52:28 -04:00
Nikolay Amiantov
b5258982d2 qt4: enable gtk2 by default 2017-04-13 02:13:07 +03:00
Dan Peebles
409fe12f76 qt4: fix to work on clang 4
The new clang is more strict about signed comparisons against pointers,
so this adds a couple of ad-hoc patches to appease it.
2017-03-30 11:03:05 -04:00
Vladimír Čunát
96d41e393d
treewide: purge maintainers.urkud
It's sad, but he's been inactive for the last five years.
Keeping such people in meta.maintainers is counter-productive.
2017-03-27 19:52:29 +02:00
Vladimír Čunát
50fadc8b18
cups: split the $lib output
This saves > 10 MB from most closures.
Printing test succeeds on x86_64-linux.
2017-03-12 18:36:30 +01:00
Bjørn Forsman
3d104ab2b3 gst-plugins-base: align attrname with pkgname 2017-02-27 12:16:26 +01:00
Vladimír Čunát
45fcefd4be
qt4: another attempt to fix build on Darwin 2017-02-04 11:28:33 +01:00
Vladimír Čunát
787c1add0b
qt4: fixup missing space between flags on Darwin
Since 9aae2991f2, /cc @globin.
2017-02-02 13:44:41 +01:00
Robin Gloster
9aae2991f2
qt4: add patch to fix build with gcc6, set c++ std 2017-01-25 20:12:36 +01:00
Matthew Bauer
74b206bce2
qt4: build webkit on Darwin
QtWebkit is needed by Anki
2017-01-17 19:49:25 -06:00
Eelco Dolstra
a5ee4d2c78 qt-4: Use multiple outputs
This is a pretty modest use of multiple outputs - mainly to eliminate
-dev outputs from Qt's closure.
2016-09-29 13:05:28 +02:00
Kirill Boltaev
bccd75094f treewide: explicitly specify gtk and related package versions 2016-09-12 18:26:06 +03:00
Nikolay Amiantov
065a7515a7 qmake4Hook: init 2016-04-20 18:48:01 +03:00
Anthony Cowley
eccfe71bae qt4.8: darwin compatibility
Supplies the necessary system frameworks.
2016-04-19 17:09:29 -04:00
Thomas Tuegel
9e5b2d5e3d qt48: fix evaluation error on Darwin 2016-03-11 09:10:10 -06:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
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