alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
104220 commits 217 branches 121 tags 4.5 GiB
Commit graph

304 commits

Author SHA1 Message Date
Nikolay Amiantov 040b86a96e qt5.qtwebengine: use system libraries where possible 
Fixes #23987.
 2017-03-23 00:03:33 +03:00
Nikolay Amiantov 3a948e6b07 qt5.qtwebengine: add proprietary codecs support 2017-03-23 00:03:33 +03:00
Nikolay Amiantov a7a858aa52 qt5.qtwebengine: patch more library paths 
Adapted from chromium derivation. Fixes qutebrowser crash.
 2017-03-23 00:00:50 +03:00
Thomas Tuegel 7aee677a10
makeQtWrapper: wrap with runtime XDG dirs 2017-03-22 07:44:05 -05:00
Nikolay Amiantov 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
Orivej Desh 583e862d11
qtbase-* nitpick: fix list nesting 
Generalized from #24036, and leaving the authorship there.
 2017-03-19 11:03:51 +01:00
Vladimír Čunát 742b120ddc
Merge branch 'master' into staging 
Nontrivial rebuilds from master, again :-/
 2017-03-18 11:00:31 +01:00
michael bishop db05f414bd
qtmultimedia-5.7: disable alsa on darwin 2017-03-16 23:15:44 -03:00
Vladimír Čunát e99bc64552
Merge branch 'master' into staging 
More larger rebuilds from master, unfortunately.
 2017-03-15 19:09:56 +01:00
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
Tuomas Tynkkynen 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
Periklis Tsirakidis 4904df80bb qt57.qtbase: enable darwin compatibility 2017-03-12 15:02:24 +01:00
Thomas Tuegel e24261ed16
qtbase: fix sed syntax in .pc file fixup 2017-03-11 16:25:48 -06: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
Thomas Tuegel 66bc2135f6
qtbase: don't patch non-existent .pc files on Darwin 2017-03-10 09:23:05 -06:00
Periklis Tsirakidis c663f6aba9 qt57: darwin compatibility 
Port of the qt56 compatibility patch 7a9400d by @acowley
 2017-03-10 08:25:09 +01:00
Vladimír Čunát ed4a79c65e
Merge branch 'master' into staging 
... to fix an evaluation problem in dogecoin.
 2017-03-09 23:14:19 +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
Thomas Tuegel 2a38551651
qtwebengine: update build system paths for Qt 5.8 2017-03-05 17:05:33 -06:00
Thomas Tuegel 869037812c
qttools: update cmake paths for Qt 5.8 2017-03-05 17:04:53 -06:00
Bjørn Forsman 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
Thomas Tuegel cd7d8a60b4
qt58: init at 5.8.0 
Qt 5.8 is now the default version.
 2017-03-04 15:08:47 -06: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