3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

20 commits

Author SHA1 Message Date
github-actions[bot] 1b5da764a7
Merge staging-next into staging 2021-01-27 12:24:09 +00:00
Ben Siraphob 3bbad8b041 treewide: remove inherited stdenv.lib 2021-01-27 12:44:43 +07:00
Thomas Tuegel 7744998f04
qtbase: Set cmakeFlags and NIX_CFLAGS_COMPILE in setupHook 2021-01-25 15:56:05 -06:00
Thomas Tuegel b80ce0aeca
qmake: Select debug or release build
The qmake hook sets its own `CONFIG+=debug` or `CONFIG+=release` depending on
how `qtbase` was built. We no longer rely on using the custom deriver for this
feature.
2021-01-24 09:51:34 -06:00
Ben Siraphob 2f78ee7e81 pkgs/development: stdenv.lib -> lib 2021-01-24 00:16:29 +07:00
Orivej Desh ff612c5e56 qt514.qtwebengine: fix build with gcc10 2021-01-05 17:27:41 +00:00
Thomas Tuegel 9c04596480 qtlocation: backport upstream patch for recent GCC 2021-01-03 10:00:18 +01:00
github-actions[bot] ec161d2240
Merge master into staging-next 2021-01-02 12:24:09 +00:00
Thomas Tuegel eed06a0da9
Merge pull request #107898 from SuperSandro2000/qtwebkit-darwin
qt514.qtwebkit: Fix patch applying
2021-01-02 05:40:09 -06:00
Frederik Rietdijk e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Sandro Jäckel d05ff6e0f4
qt514.qtwebkit: Fix patch applying 2020-12-29 19:41:51 +01:00
Doron Behar 6d13b4c5ec qt5: Update comment regarding updating srcs.nix 2020-12-28 19:52:06 +02:00
Thomas Tuegel 3db04334e3
Revert "fetch-kde-qt.sh: get hashes from metadata"
This reverts commit 4b7d9dc868.

The KDE project has changed their source index pages so that the links to
package metadata files are generated by JavaScript after the page loads. As a
result, wget is no longer able to recursively fetch the package metadata
automatically.
2020-12-26 05:24:25 -06:00
Dmitry Kalinkin 0c74da1342
qt5{14,15}.qtbase: fix on darwin 2020-11-17 10:04:09 -05:00
Frederik Rietdijk 986c2d36da Merge master into staging-next 2020-11-16 09:01:53 +01:00
Andrew Childs 1f52024720 qt514.qtbase: patch framework detection to support tbd frameworks 2020-11-12 16:57:19 +09:00
Dmitry Kalinkin ee2501f124
qt5.qtwebengine: don't override patches in qtModule
This fixes darwin build.

Fixes: 90db9641 ('qt5.qtwebengine: fix build with bison-3.7')
2020-11-09 21:11:59 -05:00
Fabian Möller f82565f87d
qt5.qtwebkit: fix build with bison-3.7 2020-08-27 11:42:53 +02:00
Jamie 4cb5383141
qt: bring back QML import patch in 5.14 (#95772)
This was missed in the 5.12 -> 5.14 update process.

Resolves #95636
2020-08-19 02:56:19 +02:00
Milan Pässler d4c607aa71 qt5: 5.12.7 -> 5.14.2
This includes contributions by @ttuegel and @DizFer. Thanks!
2020-07-31 18:50:58 +02:00