From 7b527223fde76cdfb8adec63c8546d60b795a9fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 25 Aug 2020 09:35:49 +0200 Subject: [PATCH] qtdeclarative: revert "Patch for scrollbar regression" This reverts commit 5530043208f0bef7. The change breaks the build of qtquickcontrols. Fixes https://github.com/NixOS/nixpkgs/issues/96159. --- .../libraries/qt-5/modules/qtdeclarative.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-5/modules/qtdeclarative.nix index c22857a6dc6e9a..b611282294c65d 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, 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"; - }); }