git.iko.soy/typeable/nixpkgs
on master help sign in
qt5ct: 0.39 -> 0.41
commit96b22bb697b722b9c3389abd0b304813e8a6b0d9 authorNikolay Korotkiy <sikmir@gmail.com> dateMon 16 Sep 2019, 15:20 (7 years ago) parentf8ca2f3
2 files changed+2−29
pkgs/tools/misc/qt5ct/default.nix+2−7 pkgs/tools/misc/qt5ct/wayland.patch−22
pkgs/tools/misc/qt5ct/default.nix+2−7
@@ -4,22 +4,17 @@ let inherit (lib) getDev; in
44
55mkDerivation rec {
66 pname = "qt5ct";
7− version = "0.39";
7+ version = "0.41";
88
99 src = fetchurl {
1010 url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
11− sha256 = "069y6c17gfics8rz3rdsn2x2hb39m4qka08ygwpxa8gqppffqs9p";
11+ sha256 = "1p2p6116wg5bc0hcbi2sygwlgk0g9idxpci0qdh3p4lb1plk0h7j";
1212 };
1313
1414 nativeBuildInputs = [ qmake qttools ];
1515
1616 buildInputs = [ qtbase ];
1717
18− # Wayland needs to know the desktop file name in order to show the app name and icon.
19− # Patch has been upstreamed and can be removed in the future.
20− # See: https://sourceforge.net/p/qt5ct/code/549/
21− patches = [ ./wayland.patch ];
22−
2318 qmakeFlags = [
2419 "LRELEASE_EXECUTABLE=${getDev qttools}/bin/lrelease"
2520 ];
pkgs/tools/misc/qt5ct/wayland.patchdeleted−22
@@ -1,22 +0,0 @@
1−--- a/src/qt5ct/main.cpp
2−+++ b/src/qt5ct/main.cpp
3−@@ -29,14 +29,18 @@
4− #include <QApplication>
5− #include <QLibraryInfo>
6− #include <QLocale>
7−-#include "qt5ct.h"
8−+#include <QtGlobal>
9− #include <QTranslator>
10− #include <QtDebug>
11−+#include "qt5ct.h"
12− #include "mainwindow.h"
13−
14− int main(int argc, char **argv)
15− {
16− QApplication app(argc, argv);
17−+#if (QT_VERSION >= QT_VERSION_CHECK(5, 7, 0))
18−+ QGuiApplication::setDesktopFileName("qt5ct.desktop");
19−+#endif
20− QTranslator translator;
21− QString locale = Qt5CT::systemLanguageID();
22− translator.load(QString(":/qt5ct_") + locale);