JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
122,061 Commits 2 Branches 0 Tags 12 GiB
c29db1d172
Commit Graph

412 Commits

Author SHA1 Message Date
Orivej Desh
a1b77bfe5f Revert "qt5: 5.9.1 -> 5.9.3" 
KDE frameworks 5.40 are not compatible with Qt 5.9.3: #32253

This reverts commit bd71d3aef7 (#32100).
 2017-12-02 17:22:17 +00:00
Bastian Köcher
bd71d3aef7 qt5: 5.9.2 -> 5.9.3 2017-12-01 18:34:54 +01:00
John Ericson
405412dfd9
Merge pull request #31775 from obsidiansystems/stdenv-both-propagated-files 
stdenv setup: Always use both propagated files
 2017-11-22 15:23:37 -05:00
John Ericson
da19c34d0f stdenv setup: Always use both propagated files 
This continues #23374, which always kept around both attributes, by
always including both propagated files: `propgated-native-build-inputs`
and `propagated-build-inputs`. `nativePkgs` and `crossPkgs` are still
defined as before, however, so this change should only barely
observable.

This is an incremental step to fully keeping the dependencies separate
in all cases.
 2017-11-21 10:44:44 -05:00
Orivej Desh
031367af2b qt56.qtwebengine: fix build 
Delete the patch, it has been integrated into Qt 5.6.3.
 2017-11-17 02:51:58 +00:00
Thomas Tuegel
d3efa486e5
qt59.qtbase: carefully avoid applying Linux flags to Darwin build 2017-11-12 09:51:48 -06:00
Thomas Tuegel
ded18e4f47
qt59.qtbase: restore Darwin collection-types patch 2017-11-12 09:51:48 -06:00
Thomas Tuegel
2063d54c72
qt56: 5.6.2 -> 5.6.3 2017-11-12 09:51:48 -06:00
Thomas Tuegel
04ba30ef8e
qt59.qtbase: replace type with command for POSIX compatibility 2017-11-12 09:51:48 -06:00
Thomas Tuegel
3729b77531
qt5.mkDerivation: default enableParallelBuilding = true 2017-11-12 09:51:48 -06:00
Thomas Tuegel
4f72831934
qt56.qtbase: replace type with command for POSIX compatibility 2017-11-12 09:51:47 -06:00
Thomas Tuegel
9e05d61dd7
qt56: remove unused obsolete expressions 2017-11-12 09:51:47 -06:00
Thomas Tuegel
91b362c5cf
qt56.qtwebkit: fix build with ICU 59 2017-11-12 09:51:47 -06:00
Peter Simons
c1c21cde1d
Revert "qt5: Add qtnetworkauth submodule" 2017-11-11 17:53:01 +01:00
Thomas Tuegel
1e9edbf6ee
Merge pull request #28480 from ilpianista/qt5 
qt5: Add qtnetworkauth submodule
 2017-11-11 08:25:10 -06:00
Thomas Tuegel
ae6ac0ed3e
qt5: Add instructions for updating and patching 2017-11-07 07:18:50 -06:00
Thomas Tuegel
fe0ab944db
qt5: factor out common definitions and remove symlink farm 
The module definitions are factored out and shared between qt56 and qt59. The
symlink farm which was created during builds is no longer needed.
 2017-11-07 07:18:46 -06:00
Thomas Tuegel
4866f16fba
Revert "Merge pull request #30255 from bkchr/qt_5_9_2" 
This reverts commit 4cf0b6ba5d, reversing
changes made to 756b9c7d6c.

Qt 5.9.2 is reverted to Qt 5.9.1, as recommended by KDE upstream due to
https://bugreports.qt.io/browse/QTBUG-64017
 2017-11-02 14:28:39 -05:00
Tuomas Tynkkynen
fd29f6685f qt5, plasma-5: Make 'bin' output the first one 
Stay consistent with other multiple output packages.
 2017-10-24 23:48:49 +03:00
Daiderd Jordan
215f2cac80 Merge pull request #30404 from j-hao/master 
qt5: fix Darwin build for 5.9.2
 2017-10-19 23:41:44 +02:00
Bastian Köcher
7132cbd598
qt5: Disable gold linker on Linux as it generates duplicate symbols 
Signed-off-by: adisbladis <adis@blad.is>
 2017-10-19 11:09:25 +08:00
Jun Hao
c800d574bf qt5: fix Darwin build for 5.9.2 2017-10-17 13:18:33 +08:00
Vladimír Čunát
26db832fee
qt56.qtwebkit: fix with icu-59 by upstream patch 
The patch is from qtwebkit-5.9.1, but it's fairly simple and seems to
work here as well.
 2017-10-15 15:16:53 +02:00
Thomas Tuegel
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
Jun Hao
9dd335e2bb qt59.qtbase: fix darwin build so qt full can build 2017-10-11 14:38:49 +08:00
Robin Gloster
1fbf00f0ae
Revert "qt59.qtwebengine: fix build (re: nss update)" 
This reverts commit 8a928f3916.
 2017-10-09 20:50:38 +02:00
Bastian Köcher
c8bac00921 qt5: 5.9.1 -> 5.9.2 2017-10-09 19:38:38 +02:00
Michael Raskin
8a928f3916 qt59.qtwebengine: fix build (re: nss update) 2017-10-09 18:15:30 +02:00
John Ericson
f037625f87 Merge remote-tracking branch 'upstream/staging' into deps-reorg 2017-09-28 12:32:57 -04:00
Vladimír Čunát
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
Vladimír Čunát
41aa302727
Merge branch 'master' into staging 2017-09-26 22:31:59 +02:00
Daiderd Jordan
db2538fb0c
qt5-qtbase: fix darwin build 
Fixes #27474
 2017-09-23 21:06:09 +02:00
Thomas Tuegel
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
xd1le
99eabd6c06 qt-5/qtbase-setup-hook.sh: attempt to make directories only if needed 
Resolves #29589.
 2017-09-22 22:26:02 +10:00
John Ericson
ed14223f8c treewide: Manual fix more pkg-config build-inputs 2017-09-21 15:49:54 -04:00
John Ericson
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
Alexander V. Nikolaev
a830aa3af0 qt5: Cleanup temporary Qt root on nix-shell exit 2017-09-04 03:59:38 +03:00
Lukas Werling
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
Andrea Scarpino
ab1075c0d5 qt5: Add qtnetworkauth submodule 2017-08-27 18:25:36 +02:00
Jos van den Oever
b6bf1ce319 qt5.qtcharts: enable qml 
Dependency qtdeclarative was missing so QML plugin was not built.
 2017-08-23 20:05:41 +02:00
Thomas Tuegel
88d29f80c1
qttools: move qdbusviewer to runtime output 2017-08-21 06:51:31 -05:00
Alexander V. Nikolaev
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
Thomas Tuegel
ca6f1591ba Merge pull request #27013 from expipiplus1/qt-charts 
qt5: Add qtcharts submodule
 2017-08-08 06:48:25 -05:00
Frederik Rietdijk
2203908e5f Merge commit 'b679e14' into HEAD 2017-08-07 13:19:09 +02:00
Frederik Rietdijk
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
Bastian Köcher
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
Robin Gloster
41492abf4d
qt56.qtbase: fix build 2017-08-06 21:23:38 +02:00
adisbladis
ac55c6600b
qt5: 5.9.0 -> 5.9.1 2017-07-18 19:57:11 +08:00
Joe Hermaszewski
5abfed0e0b qt5: Add qtcharts submodule 2017-07-01 15:07:49 +01:00
Thomas Tuegel
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