Thomas Tuegel
2c4995c013
qt5: factor out common qmake setup hook
2016-12-03 09:55:39 -06:00
Thomas Tuegel
53a694e096
qt5: factor out common qtSubmodule setup hook
2016-12-03 09:53:18 -06:00
Thomas Tuegel
851b5944bb
qt5: factor out common setup hook for qtbase
2016-12-03 09:51:31 -06:00
Thomas Tuegel
a6c75a7167
Merge pull request #20856 from avnik/qt5-mktemp
...
qt5: more reproducible builds
2016-12-03 09:49:12 -06:00
Alexander V. Nikolaev
f0974e1e58
qt5: more reproducible builds
...
Avoid mktemp -d in sources, where pathnames can affect result.
2016-12-02 14:31:36 +02:00
Vladimír Čunát
925b335607
Merge branch 'master' into staging
2016-11-26 11:27:09 +01:00
Frederik Rietdijk
2f25d962e8
qt57.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
Frederik Rietdijk
b21f1d70c6
qt56.qtwebengine: use python2
2016-11-24 22:28:04 +01:00
Nikolay Amiantov
ca26c4e45c
qt56: 5.6.1 -> 5.6.2
2016-11-24 01:17:56 +03:00
Jos van den Oever
1fb5a9b708
qt5: Add qtwebengine and qtwebchannel to qt5.full
2016-11-22 20:48:11 +01:00
Jos van den Oever
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
Me
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
zraexy
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
zraexy
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
Frederik Rietdijk
9b27c09465
qt56: use python2
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
8b7cc8a9a5
qt57: use python2
2016-10-18 23:16:10 +02:00
Frederik Rietdijk
8fcccec543
qt55: use python2
2016-10-18 23:16:10 +02:00
Thomas Tuegel
fc23f64d34
qt5.qtbase: ruby is no longer a dependency
2016-10-04 21:49:33 -05:00
Kirill Boltaev
bccd75094f
treewide: explicitly specify gtk and related package versions
2016-09-12 18:26:06 +03:00
Tuomas Tynkkynen
290db94f04
Merge remote-tracking branch 'upstream/master' into staging
2016-09-09 02:40:47 +03:00
Tuomas Tynkkynen
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
Eelco Dolstra
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
Tuomas Tynkkynen
6563cd34d8
qt5.6, qt5.7: Use dev output of qtbase in setupHook
2016-08-31 15:23:24 +03:00
Tuomas Tynkkynen
2f50cfe25f
qt5: Shuffle outputs
...
Unnoticed by the scripts.
2016-08-29 14:49:53 +03:00
Tuomas Tynkkynen
a17216af4c
treewide: Shuffle outputs
...
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Thomas Tuegel
43bf5d2c30
Merge pull request #18052 from loskutov/master
...
Qt5: Enable Wayland support
2016-08-28 07:38:23 -05:00
Thomas Tuegel
b8a83d901f
qt5: use absolute paths to plugins in CMake
...
This reverts commit 17f9b21c09
2016-08-28 07:33:42 -05:00
Moritz Ulrich
17f9b21c09
Revert "qt5: use absolute paths to plugins in CMake"
...
This reverts commit 7a9e04943d
2016-08-28 12:29:20 +02:00
Ignat Loskutov
cc83045026
Qt5: Enable Wayland support
2016-08-28 00:57:43 -04:00
Thomas Tuegel
7a9e04943d
qt5: use absolute paths to plugins in CMake
...
CMake needs absolute paths to plugin shared objects in case one package
provides a plugin for a different package.
2016-08-27 12:24:54 -05:00
Thomas Tuegel
f4bb247bd6
fetch-kde-qt.sh: modularize script allowing multiple versions
2016-08-25 10:07:03 -05:00
Thomas Tuegel
dedc6716e4
qt5: build without -reduce-relocations
...
Fixes #17862 .
2016-08-20 17:36:32 -05:00
Nikolay Amiantov
e3039a282a
qt5.qtwebkit: set myself as a maintainer
2016-08-17 22:46:24 +03:00
Nikolay Amiantov
c1262a76e4
qt5.qtwebkit: use gstreamer backend
...
It's recommended by upstream: https://bugs.webkit.org/show_bug.cgi?id=63472
2016-08-17 20:20:35 +03:00
Nikolay Amiantov
13fdb45c04
qt57.webkit: init at 5.7.0
2016-08-17 20:20:35 +03:00
Nikolay Amiantov
306358992a
qt56.webkit: init at 5.6.1
2016-08-17 20:20:35 +03:00
Nikolay Amiantov
b14f6a96f6
qt55: regenerate srcs
2016-08-17 20:20:35 +03:00
Nikolay Amiantov
58202a9113
qt fetchsrcs.sh: add community releases
...
Also parametrize by version and make more reproducable.
2016-08-17 20:20:35 +03:00
Thomas Tuegel
ca5b3368ca
qttools: fix CMake paths
...
Fixes #17585 .
2016-08-08 08:52:45 -05:00
Thomas Tuegel
307847e6fa
Merge pull request #17369 from ttuegel/qt-5.7
...
qt57: init at 5.7.0
2016-07-29 18:12:38 -05:00
Thomas Tuegel
839a543d41
qt57: init at 5.7.0
2016-07-29 17:46:13 -05:00
michael bishop
dd3e27f2e7
qt56: purge all refrences to gtk, solves all of the theme problems
2016-07-29 18:50:06 -03:00
Thomas Tuegel
add332c424
qt55: fix CMake module paths
2016-07-28 18:26:54 -05:00
Thomas Tuegel
6ef6c5a6f6
qt55: add missing module setup hook
2016-07-19 12:36:09 -05:00
Thomas Tuegel
6dc6ae0ebe
qt55.qtlocation: don't try to wrap missing module
2016-07-17 06:58:15 -05:00
Thomas Tuegel
343415e02e
qt55.qtbase: fix setup hook and QMake hook
2016-07-16 15:02:19 -05:00
Thomas Tuegel
78e7f44488
qt5.makeQtWrapper: do not inherit Qt search paths
2016-07-16 10:14:50 -05:00
Thomas Tuegel
766ea7c4ca
qt55.qtbase: update setup hook
2016-07-16 10:14:45 -05:00
Thomas Tuegel
d19dc420d2
qt56.qtbase: don't use propagatedUserEnvPkgs
...
Fixes #15498 .
2016-07-16 10:14:44 -05:00
Jos van den Oever
3d0e582b38
qtwebengine init at 5.6.1-1
2016-06-26 23:02:54 +02:00
Jos van den Oever
7aa1caa4d3
qtwebchannel init at 5.6.1-1
2016-06-26 23:01:42 +02:00
Jos van den Oever
af62c6123a
qt56: 5.6.1 -> 5.6.1-1
2016-06-26 20:07:31 +02:00
Tobias Geerinckx-Rice
6669fac77e
qt55.qtbase: remove unused dlopen-gtkstyle.patch
2016-06-23 12:13:24 +02:00
Thomas Tuegel
ed46b468b0
Fix Travis build failure caused by Qt/KDE documentation
...
The comments in the Qt/KDE packages caused a spurious Travis build
failure because they appeared to refer to `<nixpkgs>`.
2016-06-17 12:21:19 -05:00
Thomas Tuegel
592dcbc4bf
Fix evaluation error in Qt/KDE packages
...
For now, the source hashes will continue to be stored in the Nixpkgs
tree. The package update instructions are updated.
2016-06-17 09:47:16 -05:00
Thomas Tuegel
e39f696d06
qt56: store generated source hashes outside Nixpkgs tree
2016-06-16 15:16:49 -05:00
Thomas Tuegel
e6fdc9f7f0
Merge pull request #16092 from abbradar/qt561
...
Qt: 5.6.0 -> 5.6.1
2016-06-09 14:32:53 -05:00
Nikolay Amiantov
97d791978c
qt56: 5.6.0 -> 5.6.1
2016-06-09 18:44:56 +03:00
Thomas Tuegel
de842765be
qt56.qtbase: propagate build inputs correctly
2016-06-09 09:14:06 -05:00
Nikolay Amiantov
693b49166a
qt5: remove gtkStyle option
...
It's no more needed now that we split QGtkStyle plugin
into separate output.
2016-06-03 19:14:52 +03:00
Thomas Tuegel
b2df0a10d9
qt56.qtbase: patch CMake module paths
2016-06-01 09:35:39 -05:00
Thomas Tuegel
d423a36aa5
Revert "qt56.qtbase: apply CMake setup-hook fix locally"
...
This reverts commit 6b6f067397
2016-06-01 07:02:47 -05:00
Thomas Tuegel
6b6f067397
qt56.qtbase: apply CMake setup-hook fix locally
2016-05-31 20:48:13 -05:00
Thomas Tuegel
ca34e075e4
qt56.qtbase: create symlink farm in one pass
2016-05-31 13:02:14 -05:00
Thomas Tuegel
e0d03c43bf
qt56: make symlink farm for CMake builds like QMake
2016-05-30 16:29:41 -05:00
Thomas Tuegel
95c5bfc2dc
qt55.qmakeHook: remove temporary directory in postInstall
...
Fixes #15556 . If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-29 14:07:03 -05:00
Thomas Tuegel
747517da48
qt56.qmakeHook: remove temporary directory in postInstall
...
Fixes #15556 . If the temporary directory is not removed, it will be
retained in RPATH, which is a serious security concern.
2016-05-28 16:06:03 -05:00
Vladimír Čunát
c2ee8e1033
qt56.qtbase: fix evaluation on darwin
...
/cc @ttuegel.
Maybe there's a better way; I didn't want to spend much time.
2016-05-20 12:48:50 +02:00
Thomas Tuegel
d22df66c54
qt56: remove fixQtModuleCMakeConfig
2016-05-11 10:19:28 -05:00
Thomas Tuegel
b63899c42f
qt55.qmakeHook: fix static library relocation
2016-05-09 10:01:07 -05:00
Thomas Tuegel
62d07ae7d4
qt56.qttools: add qtdeclarative dependency
2016-05-09 10:01:07 -05:00
Thomas Tuegel
0903faa3fb
qt56.qmakeHook: fix static library relocation
2016-05-09 10:01:06 -05:00
Thomas Tuegel
7c77230224
Remove Qt 5.4.2
2016-05-09 10:01:04 -05:00
Thomas Tuegel
ea90e3e6ca
qt56: init at 5.6.0
2016-05-09 10:01:03 -05:00
Thomas Tuegel
099c59ea4e
qt55.qmakeHook: fix error when package builds no libraries
2016-05-09 10:01:03 -05:00
Thomas Tuegel
3f6a2b9441
qt55.qtbase: build QGtkStyle by default
2016-04-30 12:20:09 -05:00
Thomas Tuegel
008b3d5d84
qt55.qtbase: move moveToOutput hooks
2016-04-30 12:20:09 -05:00
Thomas Tuegel
97d9368471
qmakeHook: move libtool archives and qmake project files to $dev/lib
2016-04-30 12:20:09 -05:00
Thomas Tuegel
9ea3e371df
qt5: handle dev output even without qmake
2016-04-21 04:57:01 -05:00
Nikolay Amiantov
039ff272ee
qt55: remove configureScript from qt5Submodule
2016-04-20 19:02:13 +03:00
Nikolay Amiantov
5b17e82559
qt55.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
4a4567b731
qt54.qtmultimedia: use qmakeFlags
2016-04-20 18:55:52 +03:00
Nikolay Amiantov
b857459bdb
qt5.qmakeHook: init, move from qtbase's setup hook
2016-04-20 18:55:37 +03:00
Thomas Tuegel
84a83feb4d
qt55.qtbase: do not link $out/lib into $dev/
2016-04-20 10:01:06 -05:00
Thomas Tuegel
d5c100dc21
makeQtWrapper: defer environment settings to prePhases
2016-04-20 10:01:06 -05:00
Thomas Tuegel
8727485e08
qt55.qtbase: canonicalize paths in addToSearchPathOnce
2016-04-20 10:01:06 -05:00
Thomas Tuegel
51fe07711f
qt55.qtbase: disable plugin path debugging
2016-04-20 10:01:06 -05:00
Thomas Tuegel
35f9c58206
qt55.qtquick1: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e0a87ce931
qt55.qtdeclarative: get import paths from NIX_PROFILES
2016-04-20 10:01:06 -05:00
Thomas Tuegel
e6c91d586c
qt55.qtbase: debug NIX_PROFILES paths
2016-04-20 10:01:06 -05:00
Vladimír Čunát
33b1dbb991
qt54.qttools: fix build
...
This one particular cmake directory seems not created by the build.
Skimming Hydra's status, this probably never worked since 35f33b438c
2016-04-08 16:10:08 +02:00
Vladimír Čunát
d1df28f8e5
Merge 'staging' into closure-size
...
This is mainly to get the update of bootstrap tools.
Otherwise there were mysterious segfaults:
https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
2016-04-07 14:40:51 +02:00
Thomas Tuegel
314792d9eb
qtquick1: unset QML_IMPORT_PATH after loading
2016-03-31 16:12:35 -05:00
Thomas Tuegel
da4b9d3b62
qtdeclarative: unset QML2_IMPORT_PATH after loading
2016-03-31 16:08:24 -05:00
Thomas Tuegel
7f336a4513
qtbase: unset QT_PLUGIN_PATH after loading
2016-03-31 14:36:30 -05:00
Nikolay Amiantov
f752424924
qt55.qtbase: use more system libraries
2016-03-31 15:53:06 +03:00
Thomas Tuegel
aa2e03e6ff
qt55.qtbase: upstream patch for backing store issue
...
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.
This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-02-18 06:09:20 -06:00
Thomas Tuegel
f43eb5ece0
qt54.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
588c8499f7
qt55: don't set output flags by default
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2efbf665a3
qt55.qttools: move runtime executables to $out
2016-01-31 21:15:03 -06:00
Thomas Tuegel
0c79c7c3b2
qt54.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6e623f8784
qt54.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b3c8878a65
qt54.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a7cce8b329
qt54.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d769d6c3bd
qt54.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
2f0ec07921
qt54.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3bb5501a88
qt54.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ece0396b55
qt54.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35f33b438c
qt54.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
1a481e58ec
qt54.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4d25e97193
qt54.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
669dcb3485
qt54.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a67c2ded6b
qt54.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
b7db2185a0
qt54.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
fbcdf3ee62
qt54.qtscript: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
65ef8578c2
qt54.qtbase: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
f4e6b173bb
qt54: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d282d0bfe7
qt54.qtbase: set licenses correctly
2016-01-31 21:15:03 -06:00
Thomas Tuegel
150238dc99
qt54: updated homepage
2016-01-31 21:15:03 -06:00
Thomas Tuegel
9065ab0c8a
kde5.extra-cmake-modules: rewrite setupHook
...
The rewrite achieves three goals. First, all the installation paths are
set correctly for multiple outputs. Second, the correct search paths are
set for all types of shared data. Third, packages are installed through
propagatedUserEnvPkgs as required.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ae75c88808
qt55.qtbase: upstream patch for backing store issue
...
The included patch from upstream fixes the issue described here:
https://bugreports.qt.io/browse/QTBUG-48321
The backing store of certain widgets was being improperly invalidated,
leading to display bugs in, e.g. VLC.
This patch is included in Qt 5.6, so we should remove it when we
upgrade.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
7fae06718e
qt55.makeQtWrapper: don't set XDG_DATA_DIRS
2016-01-31 21:15:03 -06:00
Thomas Tuegel
776de6d955
qt55.qtconnectivity: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
aea5ee64db
qt55.qtenginio: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
35c7cdac5f
qt55.qtlocation: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ea0794696f
qt55.qtmultimedia: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
89dc8118b4
qt55.qtquick1: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
abcb26c2bb
qt55.qtsensors: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
50de9a3f09
qt55.qtserialport: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
02f2761233
qt55.qtsvg: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ed20a6a97c
qt55.qttools: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db7cabe098
qt55.qtwebkit: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
da454bc547
qt55.qtwebsockets: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
055b1b86c5
qt55.qtx11extras: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
27824e3332
qt55.qtxmlpatterns: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6c37bebabd
qt55.qtdeclarative: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dfabcb47b
qt55.qtscript: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
8bfae5c46d
qt55.qtbase: fix Qt module CMake config files
2016-01-31 21:15:03 -06:00
Thomas Tuegel
ac5a585ed8
qt55: add fixQtModuleCMakeConfig setup hook
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4465f438de
qt55: improve update documentation
2016-01-31 21:15:03 -06:00
Thomas Tuegel
a6c9a6f5bf
qt55.qtbase: set licenses correctly
2016-01-31 21:15:03 -06:00
Thomas Tuegel
9adcd6f78c
qt55: update homepage
2016-01-31 21:15:03 -06:00
Thomas Tuegel
6dda0824ba
qt55.qtbase: use -system-harfbuzz
2016-01-31 21:15:03 -06:00
Thomas Tuegel
74121e07a7
qt55: use multiple outputs
2016-01-31 21:15:03 -06:00
Thomas Tuegel
db69888a02
qt55.qtbase: disable documentation
...
The documentation cannot be built as part of the split-module build
anyway. After all the modules are built, we could build the
documentation as a separate package.
2016-01-31 21:15:03 -06:00
Thomas Tuegel
3cfb552bbc
qt55.qtbase: don't depend on makeWrapper
2016-01-31 21:15:03 -06:00
Thomas Tuegel
302450dbfe
qt55.qtbase: don't propagate extra Mesa dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
e64822b87d
qt55.qtbase: don't propagate gtk dependencies
2016-01-31 21:15:03 -06:00
Thomas Tuegel
4b844747a2
qt55.qtbase: don't propagate postgresql dependency
2016-01-31 21:15:03 -06:00
Thomas Tuegel
d5d7554639
qt55.qtbase: don't propagate mysql dependency
2016-01-31 21:15:03 -06:00
