From 75214a9c8b1def725560a8a5999695a11c0727f4 Mon Sep 17 00:00:00 2001 From: Chris Rendle-Short Date: Tue, 27 Aug 2019 21:28:56 +1000 Subject: [PATCH] qt5ct: fix missing app icon and name when running under Wayland Patch has been upstreamed (https://sourceforge.net/p/qt5ct/code/549/) and will be removed in the future. --- pkgs/tools/misc/qt5ct/default.nix | 5 +++++ pkgs/tools/misc/qt5ct/wayland.patch | 22 ++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/misc/qt5ct/wayland.patch diff --git a/pkgs/tools/misc/qt5ct/default.nix b/pkgs/tools/misc/qt5ct/default.nix index 9069821fe354..fbb56b98be77 100644 --- a/pkgs/tools/misc/qt5ct/default.nix +++ b/pkgs/tools/misc/qt5ct/default.nix @@ -15,6 +15,11 @@ mkDerivation rec { buildInputs = [ qtbase ]; + # Wayland needs to know the desktop file name in order to show the app name and icon. + # Patch has been upstreamed and can be removed in the future. + # See: https://sourceforge.net/p/qt5ct/code/549/ + patches = [ ./wayland.patch ]; + qmakeFlags = [ "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease" ]; diff --git a/pkgs/tools/misc/qt5ct/wayland.patch b/pkgs/tools/misc/qt5ct/wayland.patch new file mode 100644 index 000000000000..fe186cfa4692 --- /dev/null +++ b/pkgs/tools/misc/qt5ct/wayland.patch @@ -0,0 +1,22 @@ +--- a/src/qt5ct/main.cpp ++++ b/src/qt5ct/main.cpp +@@ -29,14 +29,18 @@ + #include + #include + #include +-#include "qt5ct.h" ++#include + #include + #include ++#include "qt5ct.h" + #include "mainwindow.h" + + int main(int argc, char **argv) + { + QApplication app(argc, argv); ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0)) ++ QGuiApplication::setDesktopFileName("qt5ct.desktop"); ++#endif + QTranslator translator; + QString locale = Qt5CT::systemLanguageID(); + translator.load(QString(":/qt5ct_") + locale); \ No newline at end of file