JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qtdeclarative: revert "Patch for scrollbar regression"

Browse Source 
This reverts commit 5530043208. The change breaks the build of
qtquickcontrols. Fixes https://github.com/NixOS/nixpkgs/issues/96159.
This commit is contained in:
Peter Simons 2020-08-25 09:35:49 +02:00 committed by Milan
parent c0f61f3e17
commit 7b527223fd
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/development/libraries/qt-5/modules/qtdeclarative.nix
View File

@ -1,4 +1,4 @@
{ qtModule, lib, fetchpatch, python3, qtbase, qtsvg }:
{ qtModule, lib, python3, qtbase, qtsvg }:
with lib;
@ -23,12 +23,4 @@ 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";
});
}