diff options
author | Thomas Tuegel <ttuegel@mailbox.org> | 2020-08-10 10:18:51 -0500 |
---|---|---|
committer | Frederik Rietdijk <freddyrietdijk@fridh.nl> | 2020-08-15 08:36:15 +0200 |
commit | 5530043208f0bef7aa4963f14cf599b74e9fd7e8 (patch) | |
tree | 42e53825e69cf0d4ea09a005decf6b1df565321e /pkgs/development/libraries/qt-5 | |
parent | 900b2d5a6c3fc150e7ef983fd7fb99a921585b22 (diff) |
qtdeclarative: Patch for scrollbar regression
Diffstat (limited to 'pkgs/development/libraries/qt-5')
-rw-r--r-- | pkgs/development/libraries/qt-5/modules/qtdeclarative.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index b611282294c65..c22857a6dc6e9 100644 --- a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix @@ -1,4 +1,4 @@ -{ qtModule, lib, python3, qtbase, qtsvg }: +{ qtModule, lib, fetchpatch, python3, qtbase, qtsvg }: with lib; @@ -23,4 +23,12 @@ qtModule { "bin/qmlscene" "bin/qmltestrunner" ]; + patches = + # https://mail.kde.org/pipermail/kde-distro-packagers/2020-June/000419.html + lib.optional (lib.versionAtLeast qtbase.version "5.14.2") + (fetchpatch { + url = "https://codereview.qt-project.org/gitweb?p=qt/qtdeclarative.git;a=patch;h=3e47ac319b0f53c43cc02a8356c2dec4f0daeef4"; + sha256 = "0wvncg7047q73nm0svc6kb14sigwk7sc53r4778kn033aj0qqszj"; + name = "qtdeclarative-QQuickItemView-fix-max-extent.patch"; + }); } |