4cf0b6ba5d
Merge pull request #30255 from bkchr/qt_5_9_2
...
qt5: 5.9.1 -> 5.9.2
2017-10-12 09:08:59 -05:00
9dd335e2bb
qt59.qtbase: fix darwin build so qt full can build
2017-10-11 14:38:49 +08:00
1fbf00f0ae
Revert "qt59.qtwebengine: fix build (re: nss update)"
...
This reverts commit 8a928f3916
2017-10-09 20:50:38 +02:00
c8bac00921
qt5: 5.9.1 -> 5.9.2
2017-10-09 19:38:38 +02:00
8a928f3916
qt59.qtwebengine: fix build (re: nss update)
2017-10-09 18:15:30 +02:00
f037625f87
Merge remote-tracking branch 'upstream/staging' into deps-reorg
2017-09-28 12:32:57 -04:00
e83b78b3ed
Merge older staging
...
This is almost fully rebuilt on staging (waiting for ~7.5k Darwin jobs),
but now master got ~17k rebuild, so staging wouldn't catch up this way.
2017-09-27 20:51:14 +02:00
41aa302727
Merge branch 'master' into staging
2017-09-26 22:31:59 +02:00
db2538fb0c
qt5-qtbase: fix darwin build
...
Fixes #27474
2017-09-23 21:06:09 +02:00
5eb2c7a753
Merge pull request #28237 from avnik/qt5-mktemp
...
qt5: use `mktemp -d` to create fake Qt prefix in nix-shell
2017-09-23 07:18:25 -05:00
99eabd6c06
qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed
...
Resolves #29589 .
2017-09-22 22:26:02 +10:00
ed14223f8c
treewide: Manual fix more pkg-config build-inputs
2017-09-21 15:49:54 -04:00
531e4b80c9
misc pkgs: Basic sed to get fix `pkgconfig` and `autoreconfHook` `buildInputs`
...
Only acts on one-line dependency lists.
2017-09-21 15:49:53 -04:00
a830aa3af0
qt5: Cleanup temporary Qt root on nix-shell exit
2017-09-04 03:59:38 +03:00
f0a1ab78b4
meson/ninja: add setup hooks ( #28444 )
...
* Add setupHook for meson/ninja build
* libhttpseverywhere: Use meson/ninja setupHooks
* jamomacore: Remove superfluous ninja buildInput
* Remove obsolete ninja buildPhases
These are all handled by ninja's setup hook.
* lean2, xcbuild: fix build with ninja setup hook
Ninja is a runtime dependency here. However, cmake can generate Ninja
build files as well to satisfy the setup hook.
* qtwebengine: fix build with ninja setup hook
2017-08-27 19:42:21 +02:00
ab1075c0d5
qt5: Add qtnetworkauth submodule
2017-08-27 18:25:36 +02:00
b6bf1ce319
qt5.qtcharts: enable qml
...
Dependency qtdeclarative was missing so QML plugin was not built.
2017-08-23 20:05:41 +02:00
88d29f80c1
qttools: move qdbusviewer to runtime output
2017-08-21 06:51:31 -05:00
eabe2efa10
qt5: Fallback to mktemp -d for temporary QT root.
...
Fallback to `mktemp -d` for temporary QT root, if invoked in shell mode.
Should fix problem from #27174 .
2017-08-13 17:26:27 +03:00
ca6f1591ba
Merge pull request #27013 from expipiplus1/qt-charts
...
qt5: Add qtcharts submodule
2017-08-08 06:48:25 -05:00
2203908e5f
Merge commit 'b679e14' into HEAD
2017-08-07 13:19:09 +02:00
e7651e4b60
Merge pull request #27940 from bkchr/fix_qt56_ld
...
QT5.6: Fixes compile error with wrong LD env variable
2017-08-07 13:04:43 +02:00
0053bf6d47
QT5.6: Fixes compile error with wrong LD env variable
...
QT uses -Wl linker flags and these flags only work with gcc/g++
and not with LD directly.
2017-08-07 10:51:53 +02:00
41492abf4d
qt56.qtbase: fix build
2017-08-06 21:23:38 +02:00
ac55c6600b
qt5: 5.9.0 -> 5.9.1
2017-07-18 19:57:11 +08:00
5abfed0e0b
qt5: Add qtcharts submodule
2017-07-01 15:07:49 +01:00
2ed4b6fad8
qt59: fix qtCompatVersion
...
Qt 5.9 was incorrectly identified as being plugin-compatible with Qt 5.8.
2017-06-28 08:38:38 -05:00
6916f24e84
treewide: enableParallelBuild -> enableParallelBuilding
2017-06-24 22:22:48 +02:00
22b10bac78
qt5: 5.8.0 -> 5.9.0
...
Qt 5.8 is immediately removed because its support window is ended.
The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.
kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
2017-06-24 07:43:57 -05:00
e6cf9b9df0
qt56: determine plugin and import paths from PATH
...
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
2017-06-18 08:44:47 -05:00
dab7700f6c
qt58: determine plugin and import paths from PATH
...
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
2017-06-18 08:44:47 -05:00
99ed5853eb
qt56.qtserialport: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:47 -05:00
8cc09c9e3e
qt56.qtwebkit: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:47 -05:00
c546c26e3a
qt58.qtwebkit: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
b1dcd271d1
qt58.qtserialport: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
f392614251
qt58.qtbase: use QLatin1String instead of QStringLiteral
2017-06-18 08:44:46 -05:00
7dc961b310
qttools: move runtime tools in postFixup
2017-06-18 08:44:43 -05:00
dea7372ebf
qtbase: fix plugin path in CMake modules
2017-06-18 08:44:43 -05:00
d9f29afa64
qt5: use one output by default
2017-06-18 08:44:43 -05:00
6fa41788be
qt5: separate plugins from libraries
2017-06-18 08:44:42 -05:00
5a8295e596
qtbase: setup required environment in GTK3 platform theme plugin
2017-06-18 08:44:42 -05:00
c816bbc8a8
qt5: remove makeQtWrapper
2017-06-18 08:44:42 -05:00
1607f51613
qmake: unify Darwin and Linux setup hooks
2017-06-18 08:43:39 -05:00
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation
2017-06-18 08:42:19 -05:00
210f688802
qt5: rename qmakeHook to qmake
2017-06-18 08:41:57 -05:00
3f3d33a078
qt5: use distinct `lib/qt-5.x` prefix for each minor version
...
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
2017-06-18 08:41:57 -05:00
515414ed32
Merge branch 'master' into staging
2017-05-16 18:32:43 +02:00
f5c568446a
qtwebkit-*: fix #25585 : bad RPATH entries
2017-05-16 18:30:58 +02:00
fabd48272f
Merge branch 'qt--qpa-plugin-path'
2017-05-14 13:55:42 -05:00
7c338b7df8
qtbase: search platform plugin paths before other plugin paths
2017-05-14 13:55:03 -05:00
88a5082edf
Revert "qt58: ignore NIX_PROFILES environment variable"
...
This reverts commit 6169bd98f5
2017-05-14 13:55:02 -05:00
096c008036
Fix #25723 : Remove old GNU libstdc++ for qtbase
2017-05-14 09:46:38 +02:00
2716e5bd80
qt58.qtbase: cleanup: sort attributes
2017-04-28 05:54:29 -05:00
9f00e2be18
qt58.qtbase: fix warnings in TZDIR patch
2017-04-28 05:54:28 -05:00
64418af8c5
qt58.qtbase: fix developer build
2017-04-28 05:54:22 -05:00
52ac15953e
makeQtWrapper: prefix Qt search paths
2017-04-28 05:54:21 -05:00
577c4f543b
qt58.qtbase: remove D-Bus library paths patch
...
Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
2017-04-28 05:54:19 -05:00
5735edb894
qt58.qtbase: remove OpenSSL library paths patch
...
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
2017-04-28 05:54:19 -05:00
0d0858202c
qtbase: unify Linux and Darwin patchsets
2017-04-28 05:54:17 -05:00
4bd911dcd6
qtbase: fill in configure flags
2017-04-28 05:54:17 -05:00
3062080572
qt58.qtbase: remove SSL decryption patch
...
This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
2017-04-28 05:54:16 -05:00
a579e0129c
qt58.qtbase: clean up configuration
2017-04-28 05:54:16 -05:00
e4fb41cc5b
qt58.qtbase: clean up CMake path sed scripts
2017-04-28 05:54:15 -05:00
9d9ab3de98
qt58.qtbase: replace mkspecs patch with sed script
2017-04-28 05:49:35 -05:00
1f62bf01d3
qt58.qtbase: Fix path to fallback libGL
2017-04-28 05:49:35 -05:00
8e2b6a90c0
qt58.qtbase: Fix path to libdbus
2017-04-28 05:49:35 -05:00
f45f2635e1
qt58.qtbase: Fix path to libssl and libcrypto
2017-04-28 05:49:34 -05:00
ff8fa7e397
qt58.qtbase: Fix path to libXcursor
2017-04-28 05:49:34 -05:00
40aa757898
qt58.qtbase: Fix path to libresolv
2017-04-28 05:49:34 -05:00
6169bd98f5
qt58: ignore NIX_PROFILES environment variable
2017-04-28 05:49:34 -05:00
12c981d4b7
qt58.qtbase: Fix QTCOMPOSE search patch
2017-04-28 05:49:34 -05:00
2ce3fe0a71
qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH
...
The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
2017-04-28 05:49:34 -05:00
44eb84feb6
qt58.qtbase: Update patch offsets
2017-04-28 05:49:34 -05:00
9046e54f6d
qt5: fix to work on LLVM 4
...
(this is reapplying 6b1957d17a
2017-04-25 09:37:36 -04:00
ef1e28f5f6
qt56.qtwebengine: patch more library paths
...
Backport 040b86a96e
2017-04-10 11:35:00 +03:00
775531c1e3
qt58: extend darwin compatibility
2017-04-08 09:54:46 +02:00
6b1957d17a
qt5: fix to work on LLVM 4
...
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
2017-04-06 21:00:28 -04:00
195efedd2c
qt58: Fix path to qhelpgenerator in cmake file.
...
It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
2017-04-02 11:21:34 +02:00
3dc1a4ba8b
Remove Qt 5.5
...
The community support window for Qt 5.5 has ended. All packages should
- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:40 -05:00
b4e6351c78
Remove Qt 5.7
...
The community support window for Qt 5.7 has ended. All packages should
- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
2017-03-25 08:49:37 -05:00
b97dd5f560
qt58: enable darwin compatibility
2017-03-25 09:48:17 +01:00
dd385d9468
qt57.makeQtWrapper: fix eval
2017-03-24 18:20:01 +01:00
f45cf10f6e
Merge pull request #24133 from abbradar/gtk3-qt
...
Fix GTK dependencies in wrappers
2017-03-24 01:49:41 +03:00
7d72b9b74e
Remove bbenoist from maintainers
...
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
2017-03-23 03:03:04 +01:00
040b86a96e
qt5.qtwebengine: use system libraries where possible
...
Fixes #23987 .
2017-03-23 00:03:33 +03:00
3a948e6b07
qt5.qtwebengine: add proprietary codecs support
2017-03-23 00:03:33 +03:00
a7a858aa52
qt5.qtwebengine: patch more library paths
...
Adapted from chromium derivation. Fixes qutebrowser crash.
2017-03-23 00:00:50 +03:00
a40b7d07e9
makeQtWrapper, kdeWrapper: add GTK3 dependencies
2017-03-22 20:15:32 +03:00
7aee677a10
makeQtWrapper: wrap with runtime XDG dirs
2017-03-22 07:44:05 -05:00
dec8fb077f
qt5.qtwebengine: fix library paths
...
Without this it would try to find files in qtbase
Ported to Qt 5.8.
2017-03-22 01:38:04 +03:00
583e862d11
qtbase-* nitpick: fix list nesting
...
Generalized from #24036 , and leaving the authorship there.
2017-03-19 11:03:51 +01:00
742b120ddc
Merge branch 'master' into staging
...
Nontrivial rebuilds from master, again :-/
2017-03-18 11:00:31 +01:00
db05f414bd
qtmultimedia-5.7: disable alsa on darwin
2017-03-16 23:15:44 -03:00
e99bc64552
Merge branch 'master' into staging
...
More larger rebuilds from master, unfortunately.
2017-03-15 19:09:56 +01:00
db937b9d60
qt57.full: add missing modules
...
qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.
Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
2017-03-14 22:27:20 +01:00
961c73a78c
qt56.full: add missing modules
...
qtquickcontrols2, qtwebkit.
Added in the same order as the modules are listed in default.nix (and
then reformatted the block).
(The qt55 expression already has all modules in *full.)
2017-03-14 22:27:20 +01:00
a6be98c9c1
qt57.{qtdeclarative,qtscript,qttranslations}: fix darwin compat
...
Fixes duplicate linkings issue for Qt-Frameworks provided by qtbase
during configurePhase.
2017-03-14 09:37:37 +01:00
aba0b45b86
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/development/libraries/qt-5/5.7/qtbase/default.nix
2017-03-14 00:49:22 +02:00
4904df80bb
qt57.qtbase: enable darwin compatibility
2017-03-12 15:02:24 +01:00
e24261ed16
qtbase: fix sed syntax in .pc file fixup
2017-03-11 16:25:48 -06:00
a2eae3bc44
Revert "Merge pull request #23602 from periklis/topic_qt57_darwin"
...
This reverts commit 4c0737eb80943c4ed72f
2017-03-11 00:28:23 +01:00
66bc2135f6
qtbase: don't patch non-existent .pc files on Darwin
2017-03-10 09:23:05 -06:00
c663f6aba9
qt57: darwin compatibility
...
Port of the qt56 compatibility patch 7a9400d
2017-03-10 08:25:09 +01:00
ed4a79c65e
Merge branch 'master' into staging
...
... to fix an evaluation problem in dogecoin.
2017-03-09 23:14:19 +01:00
7eb9a85b90
qt5.qtwebengine: fix library paths
...
Without this it would try to find files in qtbase.
2017-03-09 15:38:10 +03:00
2a38551651
qtwebengine: update build system paths for Qt 5.8
2017-03-05 17:05:33 -06:00
869037812c
qttools: update cmake paths for Qt 5.8
2017-03-05 17:04:53 -06:00
f5d460a7a0
qt5.qtbase: fix host_bins= path in pkg-config file
...
So that pkg-config can be used to find 'moc' etc. (Currently it points
to a non-existing path.)
Fixes #22945 ('Linux kbuild incompatible with "nix-shell -p qt5.full"').
2017-03-04 15:08:47 -06:00
cd7d8a60b4
qt58: init at 5.8.0
...
Qt 5.8 is now the default version.
2017-03-04 15:08:47 -06:00
b43614a6bb
Merge branch 'staging'
...
(Truly, this time :-)
2017-03-01 11:34:44 +01:00
0e5cce32d8
qt57: update community releases automatically
2017-02-28 11:10:02 -06:00
ffcc897090
qt5.qttools: fix path to qhelpgenerator
2017-02-28 16:48:44 +01:00
1d71027632
qt55: Add compatibility attribute for qtquickcontrols2
2017-02-27 11:50:05 -06:00
e8ad7f0570
qt5: Add compatibility attribute for qtquick1
2017-02-27 11:50:03 -06:00
e21b5da630
qt56.qtquickcontrols2: init at 5.6.2
2017-02-27 11:49:37 -06:00
490bbb288e
qt56: Update instructions
2017-02-27 11:49:32 -06:00
4f2e7a0424
Separate Qt 5 packages from dependent libraries
2017-02-27 11:49:04 -06:00
41c1534aed
qt5.qtwebengine: fix ca bundle path
2017-02-05 15:05:51 +03:00
99a83fbe1d
qt5.env: use buildEnv
...
This both simplifies the code and ensures that libraries are linked too.
2017-02-03 18:16:51 +03:00
a927abbee0
qt55.qtbase: fix patch sha with fetchpatch instead of fetchurl
2017-01-19 22:56:08 +01:00
2dcbb8e81f
kirigami: add pre-release v2
...
It requires qt5.7
2016-12-31 19:30:02 +08:00
b9d3898995
qt57: 5.7.0 -> 5.7.1
2016-12-20 07:40:53 -06:00
2a02544b34
Merge pull request #21009 from acowley/qt5.6.2-darwin
...
qt5.6: darwin compatibility
2016-12-09 09:12:43 -06:00
7a9400d338
qt5.6: darwin compatibility
...
- qtbase builds on darwin
- Downstream qmake and cmake build configurations supported
Darwin-specific changes:
Prevent `qmake -project` from adding build support files in the temp
directory to the project.
Shrink the temp directory used for building with qmake.
The issue here is that `lndir` recreates the entire directory structure
of the module we are merging into the temporary build environment. On
darwin, the framework directory structures mean that this shadow
directory tree is 17MB even though the file contents are all symlinks
into the store.
To address this, we symlink the framework directories explicitly and
use `lndir` for everything else.
2016-12-08 18:28:30 -05:00
7c29e476a7
qt5.6/5.7: PaX compat qtwebengine
...
* paxmark QtWebEngineProcess so it executes on PaX kernels
* when building on host w/PaX apply patch to fix mksnapshot
Patch taken from Gentoo[1], slightly modified to use paxctl directly.
[1] https://gitweb.gentoo.org/repo/gentoo.git/plain/dev-qt/qtwebengine/files/qtwebengine-paxmark-mksnapshot.patch
2016-12-07 20:02:41 -06:00
7b05efb90d
qt5: factor out common makeQtWrapper setup hook
2016-12-03 09:57:17 -06:00
2c4995c013
qt5: factor out common qmake setup hook
2016-12-03 09:55:39 -06:00
53a694e096
qt5: factor out common qtSubmodule setup hook
2016-12-03 09:53:18 -06:00
851b5944bb
qt5: factor out common setup hook for qtbase
2016-12-03 09:51:31 -06:00
a6c75a7167
Merge pull request #20856 from avnik/qt5-mktemp
...
qt5: more reproducible builds
2016-12-03 09:49:12 -06:00
f0974e1e58
qt5: more reproducible builds
...
Avoid mktemp -d in sources, where pathnames can affect result.
2016-12-02 14:31:36 +02:00
925b335607
Merge branch 'master' into staging
2016-11-26 11:27:09 +01:00
2f25d962e8
qt57.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
b21f1d70c6
qt56.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
ca26c4e45c
qt56: 5.6.1 -> 5.6.2
2016-11-24 01:17:56 +03:00
1fb5a9b708
qt5: Add qtwebengine and qtwebchannel to qt5.full
2016-11-22 20:48:11 +01:00
7906624425
qtwebengine: hardcode paths
...
Hardcode the paths for which the default path resolution does not work in nix.
2016-11-20 14:36:42 +01:00
bd0ffa50aa
qt56.qtwebengine: chromium clang update.py patch
...
Add patch to the clang update.py script for chromium that makes it work
the same as in qt57.qtwebengine. This avoids issues with the
subprocess.call that is used to run update.sh not liking the path it is
passed in certain build enviroments. update.sh is no longer used.
2016-11-04 14:09:09 -08:00
c15f3a8bbe
qt57.qtwebengine: make it build
...
This is an updated version of #16561 with added qt.conf to fix QtWebEngineProcess not being able to find locales copied to 5.7
2016-10-30 16:43:13 -08:00
cfda4310d6
qt56.qtwebengine: make it build
...
This is an updated version of #16561 with added qt.conf to fix QtWebEngineProcess not being able to find locales
2016-10-30 16:38:13 -08:00
9b27c09465
qt56: use python2
2016-10-18 23:16:10 +02:00
8b7cc8a9a5
qt57: use python2
2016-10-18 23:16:10 +02:00
8fcccec543
qt55: use python2
2016-10-18 23:16:10 +02:00
fc23f64d34
qt5.qtbase: ruby is no longer a dependency
2016-10-04 21:49:33 -05:00
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
290db94f04
Merge remote-tracking branch 'upstream/master' into staging
2016-09-09 02:40:47 +03:00
c5e9049ac3
qt5: Fix qt5X.full
...
Use dev outputs explicitly since they aren't the first output since the
recent changes.
2016-09-06 23:42:41 +03:00
78178d5854
systemd: Separate lib output
...
This moves libsystemd.so and libudev.so into systemd.lib, and gets rid
of libudev (which just contained a copy of libudev.so and the udev
headers). It thus reduces the closure size of all packages that
(indirectly) depend on libsystemd, of which there are quite a few (for
instance, PulseAudio and dbus). For example, it reduces the closure of
Blender from 430.8 to 400.8 MiB.
2016-09-05 19:17:14 +02:00
6563cd34d8
qt5.6, qt5.7: Use dev output of qtbase in setupHook
2016-08-31 15:23:24 +03:00
2f50cfe25f
qt5: Shuffle outputs
...
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Thomas Tuegel
Jun Hao
Robin Gloster
Bastian Köcher
Michael Raskin
John Ericson
Vladimír Čunát
Daiderd Jordan
xd1le
Alexander V. Nikolaev
Lukas Werling
Andrea Scarpino
Jos van den Oever
Thomas Tuegel
Frederik Rietdijk
Frederik Rietdijk
adisbladis
Joe Hermaszewski
Bjørn Forsman
Periklis Tsirakidis
Dan Peebles
Nikolay Amiantov
Ambroz Bizjak
Baptist BENOIST
Orivej Desh
michael bishop
Tuomas Tynkkynen
Gabriel Ebner
Graham Christensen
Peter Hoeg
Thomas Tuegel
Anthony Cowley
Will Dietz
Me
zraexy
Kirill Boltaev
Eelco Dolstra