Frederik Rietdijk
5061fe0c2c
Merge staging-next into staging
2019-08-28 08:26:42 +02:00
volth
35d68ef143
treewide: remove redundant quotes
2019-08-26 21:40:19 +00:00
Vladimír Čunát
2e6bf42a22
Merge branch 'master' into staging-next
...
There ver very many conflicts, basically all due to
name -> pname+version. Fortunately, almost everything was auto-resolved
by kdiff3, and for now I just fixed up a couple evaluation problems,
as verified by the tarball job. There might be some fallback to these
conflicts, but I believe it should be minimal.
Hydra nixpkgs: ?compare=1538299
2019-08-24 08:55:37 +02:00
Robin Gloster
3dede565c7
qt56: remove; unused, broken with openssl 1.1
2019-08-22 14:50:28 +02:00
Frederik Rietdijk
cff9e6429a
Merge staging-next into staging
2019-08-14 13:46:33 +02:00
Averell Dalton
658ffb06d6
pkgsi686Linux.qt5.qtbase: fix build
2019-08-08 20:14:55 +02:00
Thomas Tuegel
469d17a3f0
Revert "Revert "qt 5.12.0 -> 5.12.3""
...
This reverts commit bf39fc17d4
2019-08-06 14:42:51 -05:00
Frederik Rietdijk
55e4555b77
Merge master into staging-next
2019-08-01 09:42:54 +02:00
Frederik Rietdijk
bf39fc17d4
Revert "qt 5.12.0 -> 5.12.3"
...
Segmentation faults. See https://github.com/NixOS/nixpkgs/issues/65448
This reverts commit 552803f6f5
2019-07-28 12:16:29 +02:00
Thomas Tuegel
299e9345a8
Revert "qtbase: Fix paths returned by qmake -query"
2019-07-26 18:53:12 -05:00
Thomas Tuegel
e92a2f2fc2
Merge pull request #57097 from FlorianFranzen/qmake-header
...
qtbase: Fix paths returned by qmake -query
2019-07-15 08:48:23 -05:00
Jos van den Oever
552803f6f5
qt 5.12.0 -> 5.12.3
2019-07-12 14:12:52 +02:00
Thomas Tuegel
56d5963382
Merge pull request #54525 from ttuegel/feature/qt-5/wrap-qt-apps
...
Wrap Qt applications
2019-07-05 14:38:10 -05:00
Thomas Tuegel
f79fd2e826
wrapQtAppsHook: wrap Qt applications for runtime dependencies
2019-07-05 10:41:41 -05:00
Daiderd Jordan
cbfbe9ca1e
qt: remove cf-private
2019-07-03 22:20:16 +02:00
Matthew Bauer
4c3e09b022
qt5.12: patch to work on x86_64-darwin
...
unfortunately, some private headers making the logging hard to handle.
Specifically, os/activity.h that is included does not match what Qt5
is expected. This removes the activity logging (while keeping the
other logging methods) on macOS.
Fixes #63528
2019-06-23 18:29:04 -04:00
Matthew Bauer
79c0e740a7
qttools: patch qmlimportscanner for darwin builds
...
This needs to be the full path for qtmacdeploy to work. We add
${qt5.qttools.dev}/bin/qmlimportscanner as the default.
Fixes #63093
2019-06-22 22:21:38 -04:00
volth
f3282c8d1e
treewide: remove unused variables ( #63177 )
...
* treewide: remove unused variables
* making ofborg happy
2019-06-16 19:59:05 +00:00
Matthew Bauer
c4fc74b19c
qtwebengine: don’t use gn configure
...
qtwebengine has its own configure script, so don’t try to use gn.
2019-06-03 21:42:59 -04:00
worldofpeace
53afb548a5
Merge pull request #60035 from nyanloutre/kdeapps_update
...
kde_applications: 18.12.03 -> 19.04.1; kdeFrameworks: 5.56 -> 5.58; plasma-5: 5.15.3 -> 5.15.5
2019-05-23 14:36:03 -04:00
Jos van den Oever
044cd208b7
kdepim-runtime: replace sed by a proper patch
...
- remove unused qca-qt5
2019-05-20 20:18:00 -04:00
nyanloutre
895e78c9bc
qt5.qtnetworkauth: init
2019-05-20 20:17:59 -04:00
worldofpeace
bcc56cbce6
Merge pull request #60420 from dtzWill/fix/qtwebkit-libgdk-from-gtk-apparently
...
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
2019-05-19 00:28:11 -04:00
Frederik Rietdijk
0196d8f11c
Merge master into staging-next
2019-05-07 09:00:06 +02:00
volth
5ad79dc4bb
compilation for particular x86_64 architecture
2019-04-30 14:28:04 +00:00
Will Dietz
c29b17eecb
qtwebkit: fix path for libgdk-x11-2.0, it's in gtk2 apparently
2019-04-29 08:10:09 -05:00
Matthew Bauer
da38a49a24
treewide: mark bad packages
...
Some old stuff is known not to work.
2019-04-26 21:55:11 -04:00
Matthew Bauer
0fe315c9b6
treewide: remove old patches for macOS
...
These shouldn’t be needed now that we are on macOS 10.12.
2019-04-26 21:54:32 -04:00
Vladimír Čunát
2771375d6e
Merge branch 'master' into staging-next
...
Hydra nixpkgs: ?compare=1512490
2019-04-02 20:56:53 +02:00
Dmitry Kalinkin
0624deb5df
qt59.qtwebengine: fix on darwin
...
This ports a patch that is already used in 5.11. Also one of the
substituteInPlace call fails because a file doesn't exist.
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
ccd1bf610d
qt5.qtwebengine: refactor more things to use patches instead of substituteInPlace
...
qt59.qtwebengine doesn't need those fixes (probably since the recent
minor version bump)
2019-03-26 16:30:58 -04:00
Dmitry Kalinkin
1809832958
qt5.qtwebengine: disable platform check using patches
...
The previous code using substituteInPlace was broken for both 5.9 and
5.11 (latter was broken after a minor release bump). Using patches
should make things fail loudly and prevent modules/qtwebengine.nix from
being littered with version checks.
The patch for 5.12 is only tested to apply.
2019-03-26 16:30:50 -04:00
Florian Franzen
0b059cc956
qtbase: Fix paths returned by qmake -query
2019-03-09 20:46:23 +01:00
Frederik Rietdijk
5d7ab31949
Merge master into staging-next
2019-03-05 08:32:52 +01:00
Dmitry Kalinkin
4a62576c12
Merge pull request #55983 from veprbl/pr/qt5_qtwebkit_darwin_fix
...
qt511.qtwebkit: fix on darwin
2019-03-03 11:01:47 -05:00
Frederik Rietdijk
35e73c9dd5
Merge staging into staging-next
2019-03-03 09:35:42 +01:00
Pedro Pombeiro
080612a870
qt5.full: add qtwebview module to 5.11 and 5.12 packages
2019-03-02 09:50:08 +01:00
Will Dietz
5937a19a06
qtbase: let build use gold linker if it wants, maybe works now
2019-02-28 22:31:38 -06:00
Dmitry Kalinkin
518f997eb5
qt5.qtwebkit: don't set qmake variables for cmake build
2019-02-19 23:52:07 -05:00
Dmitry Kalinkin
4bbd00e934
qt511.qtwebkit: fix on darwin
...
readline is used on macOS and iOS for some javascript console (JSC). It
seems to be easier to disable it than to fix it.
2019-02-19 23:52:06 -05:00
Dmitry Kalinkin
67186defda
qt5.qtwebkit: refactor version comparison
...
This introduces usingAnnulenWebkitFork variable. Using version
check for qtbase.version is misleading because annulen's fork is not
tied to a specific qt5 release.
2019-02-19 23:51:24 -05:00
Dmitry Kalinkin
f212dd2e32
qt5.qtwebkit: link against libicucore.dylib from darwin.ICU instead of /usr/lib
...
The impure library was introduced in
775531c1e3
2019-02-19 23:51:19 -05:00
Dmitry Kalinkin
4bf4484515
qt5.qtconnectivity: fix darwin build
2019-02-16 18:13:58 -05:00
Silvan Mosberger
ddcf01bca6
Merge pull request #53848 from veprbl/pr/qtwebengine_darwin_fix
...
qt511.qtwebengine: fix on darwin
2019-01-28 02:41:53 +01:00
Dmitry Kalinkin
56dcf6e1f6
qt5.qtwebengine: refactor to use lib.versionOlder
2019-01-27 19:01:17 -05:00
Dmitry Kalinkin
ecbb9d3639
qt5.qtwebengine: don't propagate cups dependency
2019-01-20 14:57:59 -05:00
Anthony Cowley
5fc5f15206
qtxmlpatterns: fix dependency with qtdeclarative
...
In Qt-5.12, the order of the dependency between these two packages
flipped.
A symptom of the problem is an error like, `module
"QtQuick.XmlListModel" is not installed`.
The upstream changes that this reflects are in qtxmlpatterns
<8c6e24329e0477a057fd
2019-01-16 20:57:29 -05:00
Dmitry Kalinkin
45ab55e6e2
qt511.qtwebengine: fix build on darwin
...
Co-Authored-By: Josef Kemetmüller <josef.kemetmueller@gmail.com>
2019-01-12 16:40:06 -05:00
Jörg Thalheim
1b146a8c6f
treewide: remove paxutils from stdenv
...
More then one year ago we removed grsecurity kernels from nixpkgs:
https://github.com/NixOS/nixpkgs/pull/25277
This removes now also paxutils from stdenv.
2018-12-22 12:55:05 +01:00
Bastian Köcher
8e811ec295
qt5: 5.11 -> 5.12
2018-12-19 09:15:14 +01:00
