diff options
author | ajs124 <ajs124@users.noreply.github.com> | 2022-07-24 15:41:49 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-07-24 15:41:49 +0200 |
commit | fb687f603445085553e7085b24874731945d9823 (patch) | |
tree | 8b486ebb96080e4ef45fb1e7f34adc3d2e8cd495 /pkgs/servers | |
parent | 02f91e2d44e8f93705b948ac02d77108d713ce11 (diff) | |
parent | a102efba924d87452e507bb304be81fb0b7f8ee2 (diff) |
Merge pull request #177662 from fgaz/qremotecontrol-server/2.4.2
Diffstat (limited to 'pkgs/servers')
-rw-r--r-- | pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch | 26 | ||||
-rw-r--r-- | pkgs/servers/misc/qremotecontrol-server/default.nix | 38 |
2 files changed, 51 insertions, 13 deletions
diff --git a/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch b/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch new file mode 100644 index 0000000000000..0d6c9f15f3db5 --- /dev/null +++ b/pkgs/servers/misc/qremotecontrol-server/0001-fix-qt5-build-include-QDataStream.patch @@ -0,0 +1,26 @@ +From 922d3dd36ac72b29ea21c4c728a922b43b19400e Mon Sep 17 00:00:00 2001 +From: Francesco Gazzetta <fgaz@fgaz.me> +Date: Tue, 14 Jun 2022 17:55:43 +0200 +Subject: [PATCH] Another Qt5 fix + +--- + qtsingleapplication/qtlocalpeer.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/qtsingleapplication/qtlocalpeer.cpp b/qtsingleapplication/qtlocalpeer.cpp +index 4a84036..e6ccc72 100644 +--- a/qtsingleapplication/qtlocalpeer.cpp ++++ b/qtsingleapplication/qtlocalpeer.cpp +@@ -41,6 +41,9 @@ + + #include "qtlocalpeer.h" + #include <QCoreApplication> ++#if (QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)) ++#include <QDataStream> ++#endif + #include <QTime> + + #if defined(Q_OS_WIN) +-- +2.36.0 + diff --git a/pkgs/servers/misc/qremotecontrol-server/default.nix b/pkgs/servers/misc/qremotecontrol-server/default.nix index 4e752a0e2841d..748acdd4cfed4 100644 --- a/pkgs/servers/misc/qremotecontrol-server/default.nix +++ b/pkgs/servers/misc/qremotecontrol-server/default.nix @@ -1,21 +1,35 @@ -{ lib, stdenv -, fetchurl -, qmake4Hook -, qt4 +{ lib +, stdenv +, fetchgit +, qmake +, wrapQtAppsHook +, qtbase , xorg }: stdenv.mkDerivation rec { pname = "qremotecontrol-server"; - version = "2.4.1"; + version = "unstable-2014-11-05"; # basically 2.4.2 + qt5 - src = fetchurl { - url = "mirror://sourceforge/project/qrc/${version}/qremotecontrol-${version}.tar.bz2"; - sha256 = "07hzc9959a56b49jgmcv8ry8b9sppklvqs9kns3qjj3v9d22nbrp"; + src = fetchgit { + url = "https://git.code.sf.net/p/qrc/gitcode"; + rev = "8f1c55eac10ac8af974c3c20157d90ef57f7308a"; + sha256 = "sha256-AfFScec5/emG/f+yc5Zn37USIEWzGP/sBifE6Kx8d0E="; }; - nativeBuildInputs = [ qmake4Hook ]; - buildInputs = [ qt4 xorg.libXtst ]; + patches = [ + ./0001-fix-qt5-build-include-QDataStream.patch + ]; + + nativeBuildInputs = [ + qmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + xorg.libXtst + ]; postPatch = '' substituteInPlace QRemoteControl-Server.pro \ @@ -26,8 +40,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.all; maintainers = with maintainers; [ fgaz ]; - homepage = "https://qremote.org/"; - downloadPage = "https://qremote.org/download.php#Download"; + homepage = "https://sourceforge.net/projects/qrc/"; description = "Remote control your desktop from your mobile"; longDescription = '' With QRemoteControl installed on your desktop you can easily control @@ -43,4 +56,3 @@ stdenv.mkDerivation rec { ''; }; } - |