JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
103,477 Commits 2 Branches 0 Tags 13 GiB
3fac05b951
Commit Graph

287 Commits

Author SHA1 Message Date
Bjørn Forsman
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
Bjørn Forsman
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
Periklis Tsirakidis
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
Periklis Tsirakidis
4904df80bb qt57.qtbase: enable darwin compatibility 2017-03-12 15:02:24 +01:00
Daiderd Jordan
a2eae3bc44
Revert "Merge pull request #23602 from periklis/topic_qt57_darwin" 
This reverts commit 4c0737eb80, reversing
changes made to 943c4ed72f.
 2017-03-11 00:28:23 +01:00
Periklis Tsirakidis
c663f6aba9 qt57: darwin compatibility 
Port of the qt56 compatibility patch 7a9400d by @acowley
 2017-03-10 08:25:09 +01:00
Nikolay Amiantov
7eb9a85b90 qt5.qtwebengine: fix library paths 
Without this it would try to find files in qtbase.
 2017-03-09 15:38:10 +03:00
Vladimír Čunát
b43614a6bb
Merge branch 'staging' 
(Truly, this time :-)
 2017-03-01 11:34:44 +01:00
Thomas Tuegel
0e5cce32d8
qt57: update community releases automatically 2017-02-28 11:10:02 -06:00
Gabriel Ebner
ffcc897090 qt5.qttools: fix path to qhelpgenerator 2017-02-28 16:48:44 +01:00
Thomas Tuegel
1d71027632
qt55: Add compatibility attribute for qtquickcontrols2 2017-02-27 11:50:05 -06:00
Thomas Tuegel
e8ad7f0570
qt5: Add compatibility attribute for qtquick1 2017-02-27 11:50:03 -06:00
Thomas Tuegel
e21b5da630
qt56.qtquickcontrols2: init at 5.6.2 2017-02-27 11:49:37 -06:00
Thomas Tuegel
490bbb288e
qt56: Update instructions 2017-02-27 11:49:32 -06:00
Thomas Tuegel
4f2e7a0424
Separate Qt 5 packages from dependent libraries 2017-02-27 11:49:04 -06:00
Nikolay Amiantov
41c1534aed qt5.qtwebengine: fix ca bundle path 2017-02-05 15:05:51 +03:00
Nikolay Amiantov
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
Graham Christensen
a927abbee0 qt55.qtbase: fix patch sha with fetchpatch instead of fetchurl 2017-01-19 22:56:08 +01:00
Peter Hoeg
2dcbb8e81f kirigami: add pre-release v2 
It requires qt5.7
 2016-12-31 19:30:02 +08:00
Thomas Tuegel
b9d3898995
qt57: 5.7.0 -> 5.7.1 2016-12-20 07:40:53 -06:00
Thomas Tuegel
2a02544b34 Merge pull request #21009 from acowley/qt5.6.2-darwin 
qt5.6: darwin compatibility
 2016-12-09 09:12:43 -06:00
Anthony Cowley
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
Will Dietz
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
Thomas Tuegel
7b05efb90d
qt5: factor out common makeQtWrapper setup hook 2016-12-03 09:57:17 -06:00
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