diff options
| author | K900 <me@0upti.me> | 2023-05-26 14:02:05 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-05-26 14:02:05 +0300 |
| commit | fe3b3c9dfa0e351d4fb026eca3cc2199cda7da84 (patch) | |
| tree | c44c2b2a719d859578781ea2ea58cd93b0fe5418 /pkgs/development | |
| parent | 852e258823eb1e95fb2804058ad43a96ce7fca59 (diff) | |
| parent | f0c46678677d0be3c74a67fe6d49aa85d35f8e0c (diff) | |
Merge pull request #234190 from K900/qtcreator-qt6-fix
qtcreator-qt6: fix build with qt 6.5.1
Diffstat (limited to 'pkgs/development')
| -rw-r--r-- | pkgs/development/tools/qtcreator/qt6.nix | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/pkgs/development/tools/qtcreator/qt6.nix b/pkgs/development/tools/qtcreator/qt6.nix index 77dc7f7fdeef2..89b57eb9eb9da 100644 --- a/pkgs/development/tools/qtcreator/qt6.nix +++ b/pkgs/development/tools/qtcreator/qt6.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchurl +, fetchpatch , cmake , pkg-config , ninja @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-QWGwfc7A/I8xUpx9thC3FzFBKNoAei76haqbwzCXoWM="; }; + patches = [ + # fix build with Qt 6.5.1 + # FIXME: remove for next release + (fetchpatch { + url = "https://github.com/qt-creator/qt-creator/commit/9817df63fb9eae342d5bf6f28f526aa09b17e8de.diff"; + hash = "sha256-HIQuKroWUhJBWhVG3fyoBIFvezktCyQAuaZz/lvg7uk="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config |