JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
284,691 Commits 2 Branches 0 Tags 13 GiB
f7fc07717e
Commit Graph

754 Commits

Author SHA1 Message Date
Andreas Rammhold
66601282cc
qt59.qtvirtualkeyboard: fix CVE-2018-19865 
CVE-2018-19865 tracks the issue of qtvirtualkeyboard where it logs all
user input. With this commit we are applying the recommended patches
form the upstream project.

More details can be obtained from the Qt annoucement [1].

[1] https://blog.qt.io/blog/2018/12/04/qt-5-11-3-released-important-security-updates/
 2019-01-30 23:50:48 +01:00
Dmitry Kalinkin
571e44b5b8
Merge pull request #54787 from FlorianFranzen/qt59 
qt59: 5.9.3 -> 5.9.7
 2019-01-29 15:43:57 -05:00
Dmitry Kalinkin
fd75bbccb9
Revert "qt59-qtbase: fix darwin build with clang-5" 
The fix is already included in Qt 5.9.7

This reverts commit 0bf153f9c0.
 2019-01-28 19:53:52 -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
Florian Franzen
776c96272c qt59: 5.9.3 -> 5.9.7 2019-01-26 17:01:23 +01:00
Dmitry Kalinkin
ecbb9d3639
qt5.qtwebengine: don't propagate cups dependency 2019-01-20 14:57:59 -05:00
Frederik Rietdijk
f8b45e2d84 Merge staging-next into staging 2019-01-19 09:24:01 +01: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
<8c6e24329e>
and qtdeclarative <0477a057fd>
 2019-01-16 20:57:29 -05:00
Trolli Schmittlauch
4b76c4605e qt511.qtdeclarative: fix CMake qmlcachegen path 
This package contains several CMake files used for setting up its
provided tools for use in other projects build with CMake.
While packaging *ktouch* I found out that the ${_qt5Core_install_prefix}
variable doesn't expand at all, rendering the path to the `qmlcachegen`
binary useless. As a fix, the command itself is used instead of the path
to the binary.
 2019-01-13 00:09:38 +01: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
Frederik Rietdijk
10afccf145 Merge staging-next into staging 2018-12-27 18:11:34 +01:00
Orivej Desh
5c5c83fb4e qt5: update nixpkgs directory in readme 2018-12-26 20:21:35 +00: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
Nicolas Schneider
bf3a98ce04 Fix qtbase cmake for gui plugins [Qt 5.6, 5.9] 
This is 54377280f0 ported to Qt 5.6 and 5.9
LTS versions.
 2018-12-01 21:09:33 +01:00
Jörg Thalheim
7f2c30f851
Merge pull request #50521 from alyssais/qt-cf-private 
qt59.qtwebkit: fix build on Darwin
 2018-11-21 17:38:10 +00:00
Lluís Batlle i Rossell
54377280f0 Fix qtbase cmake for gui plugins 
It should fix "Broken cmake file with Qt5.10 full" #40706.

I leave to @ttuegel rearranging the patches.
 2018-11-18 19:29:43 +01:00
Alyssa Ross
874468f23e
qt59.qtwebkit: fix build on Darwin 2018-11-17 23:17:27 +00:00
Daiderd Jordan
942d90b282
qt5.qtmacextras: include cf-private on darwin 
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qmacfunctions.o
      "_OBJC_CLASS_$_NSMutableArray", referenced from:
          objc-class-ref in qmactoolbar.o
          objc-class-ref in qmactoolbardelegate.o
    ld: symbol(s) not found for architecture x86_64
 2018-11-17 21:02:22 +01:00
Tom Hall
230f71477b qtwebglplugin: init at 5.11 
Note: As with all Qt plugins, must set QT_QPA_PLATFORM_PLUGIN_PATH=~/.nix-profile/lib/qt-5.11/plugins for it to be found.
 2018-11-10 19:56:11 +00:00
Jan Malakhovski
c0a4e46714 qt5: use https, tiny cleanup 2018-11-08 05:20:19 +00:00
Daiderd Jordan
9a1a872b4a
qt5.qtbase: add cf-private on darwin 
Undefined symbols for architecture x86_64:
      "_OBJC_CLASS_$_NSDate", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSURL", referenced from:
          objc-class-ref in qcore_foundation.o
      "_OBJC_CLASS_$_NSData", referenced from:
          objc-class-ref in qcore_foundation.o
      "_CFURLCopyResourcePropertyForKey", referenced from:
          hasResourcePropertyFlag(QFileSystemMetaData const&, QFileSystemEntry const&, __CFString const*) in qfilesystemengine_unix.o
      "_CFURLCreateBookmarkDataFromFile", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
      "_kCFURLIsAliasFileKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsHiddenKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_kCFURLIsPackageKey", referenced from:
          QFileSystemEngine::fillMetaData(QFileSystemEntry const&, QFileSystemMetaData&, QFlags<QFileSystemMetaData::MetaDataFlag>) in qfilesystemengine_unix.o
      "_CFURLCreateByResolvingBookmarkData", referenced from:
          QFileSystemEngine::getLinkTarget(QFileSystemEntry const&, QFileSystemMetaData&) in qfilesystemengine_unix.o
    ld: symbol(s) not found for architecture x86_64
 2018-11-07 00:58:04 +01:00
Alyssa Ross
1c70685fdb
qt59.qtwebkit: fix build on Darwin 
Why is qtmultimedia only needed on Darwin? Why does it only fix 5.9, not
5.11? These things I do not know. What I do know is that, for some
reason, this makes qt59.qtwebkit build on Darwin.

I think the reason it hasn't also fixed 5.11 might be something to do
with the version of qtmultimedia, but I don't know enough about Qt or
cmake to figure it out. The error when trying to build qt511.qtwebkit
(with or without these changes) is:

    CMake Error at Source/cmake/OptionsQt.cmake:739 (find_package):
      Could not find a package configuration file provided by "Qt5Multimedia"
      (requested version 5.2.0) with any of the following names:

        Qt5MultimediaConfig.cmake
        qt5multimedia-config.cmake

      Add the installation prefix of "Qt5Multimedia" to CMAKE_PREFIX_PATH or set
      "Qt5Multimedia_DIR" to a directory containing one of the above files.  If
      "Qt5Multimedia" provides a separate development package or SDK, be sure it
      has been installed.
    Call Stack (most recent call first):
      Source/cmake/WebKitCommon.cmake:50 (include)
      CMakeLists.txt:137 (include)

    -- Configuring incomplete, errors occurred!
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeOutput.log".
    See also "/tmp/nix-build-qtwebkit-5.212-alpha-01-26-2018.drv-0/source/build/CMakeFiles/CMakeError.log".
 2018-10-19 10:36:48 +01:00
Eelco Dolstra
9bbd4f653f
qtgraphicaleffects: Add dev output 
This shrank my system closure by about 192 MiB.
 2018-10-08 16:32:27 +02:00
xeji
c2c9c6adfe
Merge pull request #46385 from xeji/p/broken 
mark long-failing packages broken for 18.09
 2018-09-15 00:54:49 +02:00
Uli Baum
83e5bbfb58 qt56.qtwebengine: mark as broken 
- no successful build since 2018-04-25
- not used in nixpkgs anymore
 2018-09-13 12:28:18 +02:00
Samuel Dionne-Riel
cb380983ed qt5.qtwebkit: Fixes modules src being subtly broken. 
b785d4813e introduced breakage in Qt
modules for 5.6 and 5.9, especially visible is Qt Webkit.

This was manifested by having a non-sensical build log where it is using
the top-level `src` attribute as source instead of Qt Webkit's own
source.

Were it not for the `src` top-level attribute (which is a legit
package), the error would have been made obvious by passing `null` to
`src`.

This partily reverts newly introduced way `src` can be passed to a
qtModule, instead relying on extending the `srcs` attrset.

For ZHF #45960
 2018-09-08 14:20:23 -04:00
Tom Hall
ec334d38d2 qtwebengine: Fix inputs on aarch64 
A mistake in the previous commit meant that ffmpeg wasn't added to the
propagatedBuildInputs on aarch64.
 2018-08-26 12:41:54 +01:00
Thomas Tuegel
b74dc6f0f0
Merge pull request #45122 from Thra11/qtwebengine-aarch64 
qtwebengine: Use system ffmpeg on aarch64
 2018-08-25 07:20:05 -05:00
Tom Hall
e01c61347e qtwebengine: Use system ffmpeg on aarch64 
On aarch64, linking against the vendored ffmpeg fails. Including ffmpeg
as a dependency and passing -system-ffmpeg to qmake fixes this.

Slightly odd conditional in qmakeFlags to avoid altering the list on
non-arm platforms, so that the change doesn't trigger an unneccessary
rebuild.
 2018-08-24 12:37:57 +01:00
Vladimír Čunát
765d695b89
Merge branch 'staging-next' 
Security fixes for a few packages are included.
 2018-08-21 15:36:02 +02:00
Matthew Bauer
4826f9b828 qtwebengine: remove old darwin patch 
file apparently doesn’t exist anymore
 2018-08-20 20:49:25 -05:00
Jan Malakhovski
875b48e3ea qt5.qtwebkit: disable tests 2018-08-11 09:35:36 +00:00
Jan Malakhovski
9cbddc6955 qt5.qtwebkit.hyphen: fix tests 2018-08-11 09:35:19 +00:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Orivej Desh
bbca5042ac qt511.qtbase: fix darwin build 
Qt 5.11.1 replaced one occurrence of NSMouseMoved with NSEventTypeMouseMoved:
da32360ffc.

It is not available in AppKit from macOS 10.10, therefore this change restores
NSMouseMoved: https://developer.apple.com/documentation/appkit/nsmousemoved

Closes #43258
 2018-07-10 15:27:17 +00:00
averelld
1999d279ec qt5: 5.11.0 -> 5.11.1 (#42351) 
This may be needed to unbreak a couple of builds such as nextcloud clients or rstudio: codereview.qt-project.org/#/c/232367
 2018-07-05 02:37:48 +00:00
Daiderd Jordan
738df73f2a qt5: update darwin patch for 5.11 2018-06-12 14:27:11 +02:00
Daiderd Jordan
4ed62d6b88 qt5: revert qtbase commit that removes macOS 10.10 code paths 
We use MACOSX_DEPLOYMENT_TARGET=10.10 in nixpkgs and some darwin
packages like CoreFoundation are based on the 10.10 sources from
opensource.apple.com.
 2018-06-12 14:27:11 +02:00
Bastian Köcher
b785d4813e qt5: 5.10 -> 5.11 
This is the first time since 5.9 that we also update `qtwebkit`.
`qtwebkit` is not maintained by Qt anymore and thus, we switch to the
community port as for example arch has done. To prevent pulling in
single patches, we just stick to the latest git version.
 2018-06-12 14:27:11 +02:00
Matthew Justin Bauer
4ae5f8a92a
qt: remove install_name_tool stuff 
hopefully it's not needed - the frameworks are no longer there
 2018-06-02 23:07:12 -04:00
Matthew Bauer
dcea0913e5 qt: fixup from c4cac55d69 
This commit was too aggressive in adding configure flags. Only qtbsea
needs the -no-framework flag to work correctly. Qmake will handle
everything else for us.
 2018-06-02 13:50:45 -04:00
Orivej Desh
50c82704a8 qt5.qtlocation: enable parallel building 
It was fixed in [1] which is part of 5.9.2, 5.10.0.

[1] 3ac051c454 (diff-b820e0828543b1da522ff0ab3dac6c75)
 2018-05-29 13:41:23 +00:00
Thomas Tuegel
db215a62b7
qtwebengine: fix build failure due to -Wformat-security 
ninja builds some components with -Wno-format, which is not compatible with the
default hardening setting of -Wformat-security in Nixpkgs.
 2018-05-25 20:14:05 -05:00
Will Dietz
39696b6d56 qt-5.10: don't use features that require new-ish kernels, stay compat 
Before this change:
$ readelf --notes /nix/store/zf5yja02g8n8dzgs25pqfd8w3myfzgzc-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7778 with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 3.17.0

After:
$ readelf --notes /nix/store/sg1s9hdw0b7p6h0dwg09g4lxy1acq7y6-qtbase-5.10.1/lib/libQt5Core.so

Displaying notes found at file offset 0x004a7dcc with length 0x00000020:
  Owner                 Data size       Description
  GNU                  0x00000010       NT_GNU_ABI_TAG (ABI version tag)
    OS: Linux, ABI: 2.6.28

-----------

The above paths were before rebasing the commit onto staging,
and it'd probably be good to have someone confirm the same happens
when built on a hydra builder or other non-dtzWill machine :).

[dezgeg: added comments]
 2018-05-18 03:51:20 +03:00
Matthew Bauer
c4cac55d69 qt510: disable framework build on macOS 
We prefer to have $out/include & $out/lib installed so that things
like multiple outputs can work. There is no way to do this in Qt
currently without also disabling the ‘framework’ install. Not sure if
this will break anything but it will fix issues we run into on some
projects like python2.7-pyside:

Linux: https://hydra.nixos.org/build/73219181
macOS: https://hydra.nixos.org/build/73059550

Hopefully this gives us consistency between the two.
 2018-05-08 15:46:57 -05:00
Josef Kemetmüller
472f21951a qt5.qtwebkit: Reduce log size to fix hydra build 
This should fix the darwin build of qtwebkit.
 2018-05-06 18:44:31 +02:00
Matthew Bauer
ec632b745f qtwebengine: rewrite 
Fixes #39334
and Fixes #36729

Also, Fixes #36932 (hopefully it's still building)

(This might be able to be able to be cherry-picked to 18.03 but be
careful - chromium is extremely touchy. Probably best to wait for it
to be built successfully on Hydra a few times.)
 2018-04-24 23:57:46 -05:00
Shea Levy
05e375d710
Merge remote-tracking branch 'origin/master' into staging 2018-03-28 09:36:47 -04:00
Corey O'Connor
807a308623 qtwebengine: correct how NIX_BUILD_CORES is propagated to the gn driven ninja. 2018-03-26 12:32:46 -07:00
Nikolay Amiantov
a5b2e0277a qt5.qtwebengine: fix build 2018-03-26 14:01:49 +03:00
Robin Gloster
8a244db9f3
libsForQt5.qtspeech: enable 2018-03-24 12:07:52 +01:00
Tuomas Tynkkynen
ef64208eba Merge commit '3ab2949' from staging into master 
Conflicts:
	pkgs/development/compilers/llvm/6/llvm.nix
	pkgs/servers/home-assistant/component-packages.nix
 2018-03-15 22:30:56 +02:00
Daiderd Jordan
ecbb9027ea
Merge pull request #36847 from badi/qtlocation 
qtlocation: fix darwin build
 2018-03-14 00:14:53 +01:00
Tuomas Tynkkynen
2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging 
Conflicts:
	pkgs/development/tools/build-managers/conan/default.nix
 2018-03-13 23:04:18 +02:00
volth
7ec0471242 treewide: s/xlibs/xorg/g (#36889) 2018-03-13 10:16:03 +00:00
John Ericson
dde80d705e qtbase: Fix x86_64-conditional logic 
Now works with cross and old and new meta checks alike.
 2018-03-12 18:55:41 -04:00
Badi Abdul-Wahid
833851cd6e
qtlocation: fix darwin build 
A dependency (boost) makes use of `std::auto_ptr`, which is no longer
supported in C++17 in Clang. This change re-enables `std::auto_ptr`
capabilities.
 2018-03-12 02:04:28 -04:00
Jan Malakhovski
7079e744d4 Merge branch 'master' into staging 
Resolved the following conflicts (by carefully applying patches from the both
branches since the fork point):

   pkgs/development/libraries/epoxy/default.nix
   pkgs/development/libraries/gtk+/3.x.nix
   pkgs/development/python-modules/asgiref/default.nix
   pkgs/development/python-modules/daphne/default.nix
   pkgs/os-specific/linux/systemd/default.nix
 2018-03-10 20:38:13 +00:00
Vladimír Čunát
565bd805e6
Merge branch 'master' 2018-03-05 14:53:27 +01:00
Matthew Bauer
4e207ba1df
qt5: install headers on darwin also 2018-02-28 22:37:35 +01:00
Daiderd Jordan
b4cf3f7909
Merge pull request #35349 from matthewbauer/qt5-darwin-pkgconfig 
qt5: install pkg_config files on darwin
 2018-02-27 00:05:56 +01:00
adisbladis
0e086dd1c1
Merge pull request #34993 from bkchr/qt_5_10_1 
qt5: 5.10.0 -> 5.10.1
 2018-02-26 03:43:02 +08:00
Alexander V. Nikolaev
e94cd63bf5 treewide: transition libGL/libGLU for qt 
Also rename mesaSupported to libGLSupported
 2018-02-24 17:06:49 +02:00
Matthew Bauer
a98a767695 qt5: install pkg_config files on darwin 
Fixes #31685

This patch is applied in Homebrew here and looks to have worked for
them:

fafbdbd237/Formula/qt.rb (L33-L44)

I rewrote the patch to work in our src tree (got rid of qtbase/ prefix
in files).

Right now I am just applying the patch in 5.10 because I don’t have
time to try these out on 5.6 or 5.9. Anyone who wants to can try it on
those if they have time.

This should be based off of staging and need to test in Hydra before
we don’t have extra issues introduced.
 2018-02-22 11:21:59 -06:00
Shea Levy
32ce7012f0
Merge branch 'master' into gcc-7 2018-02-18 16:27:22 -05:00
Bjørn Forsman
09cf3506fa qt5X.full: add "-full" to package name 
This aligns the package name more with the attrname.

This is a re-application of the idea behind 7405af72e6
("qt: make package names of "full" variants appear as such"), which
seems to have been lost on the way.
 2018-02-18 14:44:16 +01:00
Nikolay Amiantov
44901407f0 qtEnv: fix paths in qt.conf 
The shell variables from setup hook are not visible here, so instead substitute
them from Nix side.
 2018-02-18 14:44:16 +01:00
Bjørn Forsman
7ab180999b qt510.full: add missing modules 
Specifically: qtquickcontrols2, qtvirtualkeyboard, qtwebchannel,
qtwebengine, qtwebkit.

This fixes a regression since qt56.full.
 2018-02-18 12:58:26 +01:00
Bjørn Forsman
23cdc3224a qt59.full: add missing modules 
Specifically: qtquickcontrols2, qtwebchannel, qtwebengine, qtwebkit.

This fixes a regression since qt56.full.
 2018-02-18 12:58:26 +01:00
Vladimír Čunát
d4f1587da5
qt5*.qtwebkit: disable a warning to fit log on Hydra 
Before > 64 MiB, now ~25 MiB.
 2018-02-17 09:45:38 +01:00
Bastian Köcher
5abf6ef5a8 qt5: 5.10.0 -> 5.10.1 2018-02-15 08:54:29 +01:00
Daiderd Jordan
0bf153f9c0
qt59-qtbase: fix darwin build with clang-5 2018-02-12 22:50:36 +01:00
Daiderd Jordan
a93b1ea803
qt510-qtbase: fix darwin build with clang-5 2018-02-12 22:15:04 +01:00
Daiderd Jordan
0905e5e23a
qt59-qtbase: fix darwin build 2018-02-10 20:30:38 +01:00
Thomas Tuegel
4a39533ab3
qt5: debug flag should never be null 2018-01-20 09:10:57 -06:00
Thomas Tuegel
c1720b412b
qt5.mkDerivation: honor argument NIX_CFLAGS_COMPILE 
If ‘mkDerivation’ is passed ‘NIX_CFLAGS_COMPILE’, we should include those flags
along with the common flags.

See also: #34039 #34038 #33935 #33933 #33930 #33927
 2018-01-20 09:10:57 -06:00
Daiderd Jordan
62633d0605
qt510-qtbase: fix darwin build 
Includes most of the changes from 3793320958,
moved it to a separate patch to avoid accidental removal.
 2018-01-17 22:07:35 +01:00
Thomas Tuegel
5783980fc6
qtbase: fix evaluation error 
`git rebase` strikes again!
 2018-01-15 19:12:01 -06:00
Thomas Tuegel
04239641b5
Merge branch 'bugfix/qt-5/closure-size-static-libs' into merge/qt-5.10.0 2018-01-15 18:49:27 -06:00
Thomas Tuegel
617c4f4220
Merge branch 'feature/qt-5/5.10.0' into merge/qt-5.10.0 2018-01-15 18:49:13 -06:00
Thomas Tuegel
75d2a7dc4d
qt5: reduce closure size 
First, closure size is reduced by including the static libraries in $out instead
of trying to move them to $dev. The Qt build system cannot handle libraries
being split between different prefixes. Previously, the static libraries were
moved into $dev and the shared libraries were symlinked from $out to $dev to
fool the build system. However, this causes $dev to be retained at
runtime. Instead, we now keep the static libraries in $out. Fortunately, the
static libraries are not very large anyway.

Second, we build with QT_NO_DEBUG defined unless debugging is enabled. This
causes some assertions to be removed; when assertions are included, they pull
paths from $dev into the runtime closure by using the __FILE__ macro. We also
now patch qtbase to remove even more assertions when QT_NO_DEBUG is defined.
 2018-01-15 18:48:37 -06:00
Daiderd Jordan
3793320958
qt5-qtbase: update darwin patch 2018-01-09 22:47:34 +01:00
Will Dietz
42b84057a4 qt5.6: backport seccomp patch to fix errors w/new glibc + epoll_pwait 
Based on:
4e8083b4ab

Fixes mendeley bug mentioned in #33396,
which links to related issues in other distributions and upstream Qt.
 2018-01-04 13:08:51 -06:00
Bastian Köcher
e5b1a5724e Qt5: 5.9.3 -> 5.10.0 2018-01-02 14:01:37 +01:00
John Ericson
4d2b763817
Merge pull request #26805 from obsidiansystems/cross-elegant 
Make cross compilation elegant
 2017-12-30 22:58:02 -05:00
John Ericson
046f091e0d treewide: Don't use envHook anymore 
This commits needs a MAJOR audit as I oftentimes just guessed which of
`$hostOffset`, `$targetOffset`, or a fixed offset should be used.
 2017-12-30 22:04:22 -05:00
Vladimír Čunát
f29000b002
Merge branch 'master' into staging 
Hydra: ?compare=1421760
 2017-12-29 10:13:33 +01:00
Robin Gloster
9359050ae2 mariadb: more lib -> connector-c 2017-12-29 02:18:35 +01:00
adisbladis
907face464
qt5: Add qtvirtualkeyboard submodule 2017-12-28 21:13:45 +08:00
Orivej Desh
fb349c84e2 qt5.qttools: install macdeployqt on darwin 2017-12-20 08:56:54 +00:00
Thomas Tuegel
145e0f9940
Revert "Revert "qt5: 5.9.1 -> 5.9.3"" 
This reverts commit a1b77bfe5f.

KDE Frameworks are updated to version 5.41.0 which is compatible with Qt 5.9.3.
 2017-12-11 11:32:16 -06:00
Orivej Desh
f568450637 qmake: enable parallel building of qmake projects by default 2017-12-07 08:52:42 +00: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
Bjørn Forsman
6916f24e84 treewide: enableParallelBuild -> enableParallelBuilding 2017-06-24 22:22:48 +02:00
Thomas Tuegel
22b10bac78
qt5: 5.8.0 -> 5.9.0 
Qt 5.8 is immediately removed because its support window is ended.

The qtlocation module is built with `enableParallelBuilding = false` so that the
clipper library will be built before the components which link to it.

kjs now depends directly on pcre. The dependency was previously propagated from
qtbase, which now depends on pcre2.
 2017-06-24 07:43:57 -05:00
Thomas Tuegel
e6cf9b9df0
qt56: determine plugin and import paths from PATH 
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further modification.
 2017-06-18 08:44:47 -05:00
Thomas Tuegel
dab7700f6c
qt58: determine plugin and import paths from PATH 
Plugin and QML import paths were previously determined by NIX_PROFILES. Using
PATH instead allows Qt applications to work under nix-shell without further
modification.
 2017-06-18 08:44:47 -05:00
Thomas Tuegel
99ed5853eb
qt56.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel
8cc09c9e3e
qt56.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:47 -05:00
Thomas Tuegel
c546c26e3a
qt58.qtwebkit: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel
b1dcd271d1
qt58.qtserialport: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel
f392614251
qt58.qtbase: use QLatin1String instead of QStringLiteral 2017-06-18 08:44:46 -05:00
Thomas Tuegel
7dc961b310
qttools: move runtime tools in postFixup 2017-06-18 08:44:43 -05:00
Thomas Tuegel
dea7372ebf
qtbase: fix plugin path in CMake modules 2017-06-18 08:44:43 -05:00
Thomas Tuegel
d9f29afa64
qt5: use one output by default 2017-06-18 08:44:43 -05:00
Thomas Tuegel
6fa41788be
qt5: separate plugins from libraries 2017-06-18 08:44:42 -05:00
Thomas Tuegel
5a8295e596
qtbase: setup required environment in GTK3 platform theme plugin 2017-06-18 08:44:42 -05:00
Thomas Tuegel
c816bbc8a8
qt5: remove makeQtWrapper 2017-06-18 08:44:42 -05:00
Thomas Tuegel
1607f51613
qmake: unify Darwin and Linux setup hooks 2017-06-18 08:43:39 -05:00
Thomas Tuegel
7b6f8dc77f
qt5: move kdeDerivation to qt5.mkDerivation 2017-06-18 08:42:19 -05:00
Thomas Tuegel
210f688802
qt5: rename qmakeHook to qmake 2017-06-18 08:41:57 -05:00
Thomas Tuegel
3f3d33a078
qt5: use distinct lib/qt-5.x prefix for each minor version 
Using a distinct prefix for plugins and QML libraries allows multiple Qt 5 minor
versions to coexist in the same environment.
 2017-06-18 08:41:57 -05:00
Vladimír Čunát
515414ed32
Merge branch 'master' into staging 2017-05-16 18:32:43 +02:00
Vladimír Čunát
f5c568446a
qtwebkit-*: fix #25585: bad RPATH entries 2017-05-16 18:30:58 +02:00
Thomas Tuegel
fabd48272f
Merge branch 'qt--qpa-plugin-path' 2017-05-14 13:55:42 -05:00
Thomas Tuegel
7c338b7df8
qtbase: search platform plugin paths before other plugin paths 2017-05-14 13:55:03 -05:00
Thomas Tuegel
88a5082edf
Revert "qt58: ignore NIX_PROFILES environment variable" 
This reverts commit 6169bd98f5.
 2017-05-14 13:55:02 -05:00
Periklis Tsirakidis
096c008036 Fix #25723: Remove old GNU libstdc++ for qtbase 2017-05-14 09:46:38 +02:00
Thomas Tuegel
2716e5bd80
qt58.qtbase: cleanup: sort attributes 2017-04-28 05:54:29 -05:00
Thomas Tuegel
9f00e2be18
qt58.qtbase: fix warnings in TZDIR patch 2017-04-28 05:54:28 -05:00
Thomas Tuegel
64418af8c5
qt58.qtbase: fix developer build 2017-04-28 05:54:22 -05:00
Thomas Tuegel
52ac15953e
makeQtWrapper: prefix Qt search paths 2017-04-28 05:54:21 -05:00
Thomas Tuegel
577c4f543b
qt58.qtbase: remove D-Bus library paths patch 
Qt is configured with `-dbus-linked` which causes the library paths to be
resolved at compile time and added to RPATH.
 2017-04-28 05:54:19 -05:00
Thomas Tuegel
5735edb894
qt58.qtbase: remove OpenSSL library paths patch 
Qt is configure with `-openssl-linked` which causes the library paths to be
resolved at build time and added to RPATH.
 2017-04-28 05:54:19 -05:00
Thomas Tuegel
0d0858202c
qtbase: unify Linux and Darwin patchsets 2017-04-28 05:54:17 -05:00
Thomas Tuegel
4bd911dcd6
qtbase: fill in configure flags 2017-04-28 05:54:17 -05:00
Thomas Tuegel
3062080572
qt58.qtbase: remove SSL decryption patch 
This option does not require a patch; it can be enabled through
NIX_CFLAGS_COMPILE.
 2017-04-28 05:54:16 -05:00
Thomas Tuegel
a579e0129c
qt58.qtbase: clean up configuration 2017-04-28 05:54:16 -05:00
Thomas Tuegel
e4fb41cc5b
qt58.qtbase: clean up CMake path sed scripts 2017-04-28 05:54:15 -05:00
Thomas Tuegel
9d9ab3de98
qt58.qtbase: replace mkspecs patch with sed script 2017-04-28 05:49:35 -05:00
Thomas Tuegel
1f62bf01d3
qt58.qtbase: Fix path to fallback libGL 2017-04-28 05:49:35 -05:00
Thomas Tuegel
8e2b6a90c0
qt58.qtbase: Fix path to libdbus 2017-04-28 05:49:35 -05:00
Thomas Tuegel
f45f2635e1
qt58.qtbase: Fix path to libssl and libcrypto 2017-04-28 05:49:34 -05:00
Thomas Tuegel
ff8fa7e397
qt58.qtbase: Fix path to libXcursor 2017-04-28 05:49:34 -05:00
Thomas Tuegel
40aa757898
qt58.qtbase: Fix path to libresolv 2017-04-28 05:49:34 -05:00
Thomas Tuegel
6169bd98f5
qt58: ignore NIX_PROFILES environment variable 2017-04-28 05:49:34 -05:00
Thomas Tuegel
12c981d4b7
qt58.qtbase: Fix QTCOMPOSE search patch 2017-04-28 05:49:34 -05:00
Thomas Tuegel
2ce3fe0a71
qt58.qtbase: Fix QT_QPA_PLATFORM_PLUGIN_PATH 
The default installation path for QPA plugins is appended to
QT_QPA_PLATFORM_PLUGIN_PATH, making it unnecessary to wrap some applications and
preventing applications from loading platform plugins from the wrong Qt version.
 2017-04-28 05:49:34 -05:00
Thomas Tuegel
44eb84feb6
qt58.qtbase: Update patch offsets 2017-04-28 05:49:34 -05:00
Dan Peebles
9046e54f6d qt5: fix to work on LLVM 4 
(this is reapplying 6b1957d17a, which got
lost in a merge)

Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
 2017-04-25 09:37:36 -04:00
Nikolay Amiantov
ef1e28f5f6 qt56.qtwebengine: patch more library paths 
Backport 040b86a96e.
 2017-04-10 11:35:00 +03:00
Periklis Tsirakidis
775531c1e3 qt58: extend darwin compatibility 2017-04-08 09:54:46 +02:00
Dan Peebles
6b1957d17a qt5: fix to work on LLVM 4 
Including apple_sdk.sdk is generally a recipe for a bad time on LLVM 3.8
and above, since you end up with bad headers in the wrong place that hurt
the new libc++ in 3.8 and above. In this case, qt only wanted the super-
generic SDK for CUPS headers, which we can just depend on directly now.
 2017-04-06 21:00:28 -04:00
Ambroz Bizjak
195efedd2c qt58: Fix path to qhelpgenerator in cmake file. 
It is located in the dev output, fix it as for qcollectiongenerator.
This fixes a build error in KDevelop.
 2017-04-02 11:21:34 +02:00
Thomas Tuegel
3dc1a4ba8b
Remove Qt 5.5 
The community support window for Qt 5.5 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
 2017-03-25 08:49:40 -05:00
Thomas Tuegel
b4e6351c78
Remove Qt 5.7 
The community support window for Qt 5.7 has ended. All packages should

- update to Qt 5.8, or
- pin to Qt 5.6 (the 3-year long-term support release), or
- for proprietary software, use the vendored libraries.
 2017-03-25 08:49:37 -05:00
Periklis Tsirakidis
b97dd5f560 qt58: enable darwin compatibility 2017-03-25 09:48:17 +01:00
Robin Gloster
dd385d9468
qt57.makeQtWrapper: fix eval 2017-03-24 18:20:01 +01:00
Nikolay Amiantov
f45cf10f6e Merge pull request #24133 from abbradar/gtk3-qt 
Fix GTK dependencies in wrappers
 2017-03-24 01:49:41 +03:00
Baptist BENOIST
7d72b9b74e Remove bbenoist from maintainers 
Sorry guys but I did not used Nix since months and cannot spend time
maintaining my previous work...
 2017-03-23 03:03:04 +01:00
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
Nikolay Amiantov
a40b7d07e9 makeQtWrapper, kdeWrapper: add GTK3 dependencies 2017-03-22 20:15:32 +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
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.

This is a partial unrevert. Qt 5.6 and Qt 5.7 remain building and
working. Qt 5.5 stays building but broken.
 2016-08-28 07:33:42 -05:00
Moritz Ulrich
17f9b21c09 Revert "qt5: use absolute paths to plugins in CMake" 
This reverts commit 7a9e04943d.

The commit in question breaks the patches to qtbase, causing the build to fail. An issue to track this feature will follow.
 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