alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #187762 from NickCao/qt6-xcursor

Browse source 
qt6.qtbase: patch for loading libXcursor
This commit is contained in:
Thomas Tuegel 2022-09-21 10:15:51 -05:00 committed by GitHub
parent 1ef96c2f24 e955d5d7ba
commit 7ab0da78e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
pkgs/development/libraries/qt-6/default.nix
View file

@ -49,6 +49,7 @@ 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 { };

4
pkgs/development/libraries/qt-6/modules/qtbase.nix
View file

@ -201,6 +201,10 @@ stdenv.mkDerivation rec {
"-DQT_FEATURE_openssl_linked=ON"
];
NIX_CFLAGS_COMPILE = [
''-DNIXPKGS_LIBXCURSOR="${libXcursor.out}/lib/libXcursor"''
];
outputs = [ "out" "dev" ];
postInstall = ''

29
pkgs/development/libraries/qt-6/patches/0007-qtbase-xcursor.patch Normal file
View file

@ -0,0 +1,29 @@
From cc953cc3f736fabef1f5c211964f30be719fb35e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
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