qremotecontrol-server: 2.4.2 -> unstable-2014-11-05, use Qt5

Qt4 is going to be removed: #174634

+47 -12
+26
pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch
··· 1 + From 922d3dd36ac72b29ea21c4c728a922b43b19400e Mon Sep 17 00:00:00 2001 2 + From: Francesco Gazzetta <fgaz@fgaz.me> 3 + Date: Tue, 14 Jun 2022 17:55:43 +0200 4 + Subject: [PATCH] Another Qt5 fix 5 + 6 + --- 7 + qtsingleapplication/qtlocalpeer.cpp | 3 +++ 8 + 1 file changed, 3 insertions(+) 9 + 10 + diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp 11 + index 4a84036..e6ccc72 100644 12 + --- a/qtsingleapplication/qtlocalpeer.cpp 13 + +++ b/qtsingleapplication/qtlocalpeer.cpp 14 + @@ -41,6 +41,9 @@ 15 + 16 + #include "qtlocalpeer.h" 17 + #include <QCoreApplication> 18 + +#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) 19 + +#include <QDataStream> 20 + +#endif 21 + #include <QTime> 22 + 23 + #if defined(Q_OS_WIN) 24 + -- 25 + 2.36.0 26 +
+20 -11
pkgs/servers/misc/qremotecontrol-server/default.nix
··· 1 1 { lib 2 2 , stdenv 3 3 , fetchgit 4 - , qmake4Hook 5 - , qt4 4 + , qmake 5 + , wrapQtAppsHook 6 + , qtbase 6 7 , xorg 7 8 }: 8 9 9 10 stdenv.mkDerivation rec { 10 11 pname = "qremotecontrol-server"; 11 - version = "2.4.2"; 12 + version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 12 13 13 - # There is no 2.4.2 release tarball, but there is a git tag 14 14 src = fetchgit { 15 15 url = "https://git.code.sf.net/p/qrc/gitcode"; 16 - rev = version; 17 - sha256 = "sha256-i3X575SbrWV8kWWHAhXvKl5aSKFZm0VyrJOiL7eYrCo="; 16 + rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a"; 17 + sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E="; 18 18 }; 19 19 20 - nativeBuildInputs = [ qmake4Hook ]; 21 - buildInputs = [ qt4 xorg.libXtst ]; 20 + patches = [ 21 + ./0001-fix-qt5-build-include-QDataStream.patch 22 + ]; 23 + 24 + nativeBuildInputs = [ 25 + qmake 26 + wrapQtAppsHook 27 + ]; 28 + 29 + buildInputs = [ 30 + qtbase 31 + xorg.libXtst 32 + ]; 22 33 23 34 postPatch = '' 24 35 substituteInPlace QRemoteControl-Server.pro \ ··· 29 40 license = licenses.gpl3; 30 41 platforms = platforms.all; 31 42 maintainers = with maintainers; [ fgaz ]; 32 - homepage = "https://qremote.org/"; 33 - downloadPage = "https://qremote.org/download.php#Download"; 43 + homepage = "https://sourceforge.net/projects/qrc/"; 34 44 description = "Remote control your desktop from your mobile"; 35 45 longDescription = '' 36 46 With QRemoteControl installed on your desktop you can easily control ··· 46 56 ''; 47 57 }; 48 58 } 49 -
+1 -1
pkgs/top-level/all-packages.nix
··· 22962 22962 22963 22963 qpid-cpp = callPackage ../servers/amqp/qpid-cpp { }; 22964 22964 22965 - qremotecontrol-server = callPackage ../servers/misc/qremotecontrol-server { }; 22965 + qremotecontrol-server = libsForQt5.callPackage ../servers/misc/qremotecontrol-server { }; 22966 22966 22967 22967 rabbitmq-server = callPackage ../servers/amqp/rabbitmq-server { 22968 22968 inherit (darwin.apple_sdk.frameworks) AppKit Carbon Cocoa;