From 86c307d1f7dc0ab698a6ae8cf873612f8cef24dd Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 29 Sep 2022 19:39:31 +0800 Subject: [PATCH] qt6.qtbase: drop patch for Xcursor --- pkgs/development/libraries/qt-6/default.nix | 1 - .../qt-6/patches/0007-qtbase-xcursor.patch | 29 ------------------- 2 files changed, 30 deletions(-) delete mode 100644 pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix index fde9534f0ae5..8c12cc2fb671 100644 --- a/pkgs/development/libraries/qt-6/default.nix +++ b/pkgs/development/libraries/qt-6/default.nix @@ -49,7 +49,6 @@ let withGtk3 = true; inherit (srcs.qtbase) src version; inherit bison cups harfbuzz libGL dconf gtk3 developerBuild cmake; - patches = [ ./patches/0007-qtbase-xcursor.patch ]; }; qt3d = callPackage ./modules/qt3d.nix { }; diff --git a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch b/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch deleted file mode 100644 index 6a92a9528303..000000000000 --- a/pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch +++ /dev/null @@ -1,29 +0,0 @@ -From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001 -From: Thomas Tuegel -Date: Tue, 17 Sep 2019 05:35:58 -0500 -Subject: [PATCH 07/10] qtbase-xcursor - ---- - src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/plugins/platforms/xcb/qxcbcursor.cpp b/src/plugins/platforms/xcb/qxcbcursor.cpp -index fbadab4d50..c83ce0af5b 100644 ---- a/src/plugins/platforms/xcb/qxcbcursor.cpp -+++ b/src/plugins/platforms/xcb/qxcbcursor.cpp -@@ -317,10 +317,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) - #if QT_CONFIG(xcb_xlib) && QT_CONFIG(library) - static bool function_ptrs_not_initialized = true; - if (function_ptrs_not_initialized) { -- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); -+ QLibrary xcursorLib(QLatin1String(NIXPKGS_LIBXCURSOR), 1); - bool xcursorFound = xcursorLib.load(); - if (!xcursorFound) { // try without the version number -- xcursorLib.setFileName(QLatin1String("Xcursor")); -+ xcursorLib.setFileName(QLatin1String(NIXPKGS_LIBXCURSOR)); - xcursorFound = xcursorLib.load(); - } - if (xcursorFound) { --- -2.25.1 -