From dcbc753c4fb5c51e93a6d1a277e2d57700779572 Mon Sep 17 00:00:00 2001 From: aucub <78630225+aucub@users.noreply.github.com> Date: Thu, 21 Nov 2024 04:17:49 +0800 Subject: [PATCH] deskflow: 1.17.1 -> 1.17.2 --- pkgs/by-name/de/deskflow/package.nix | 30 ++++++++++++++++++---------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index f56c6070d4ff..222396e3240e 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -32,13 +32,13 @@ }: stdenv.mkDerivation rec { pname = "deskflow"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "deskflow"; repo = "deskflow"; - rev = "v${version}"; - hash = "sha256-cEKG9MwENbZqrfRdwiZtRWmIfRndrWUoaZQ5O7YRpBs="; + rev = "refs/tags/v${version}"; + hash = "sha256-CHlvL/MC9clFrMxlfIXaCFoTkcLS7QsYK7MXMFW0188="; }; postPatch = '' @@ -87,22 +87,32 @@ stdenv.mkDerivation rec { lerc ]; - postInstall = '' - substituteInPlace $out/share/applications/deskflow.desktop \ - --replace-fail "Path=/usr/bin" "Path=$out/bin" \ - --replace-fail "Exec=/usr/bin/deskflow" "Exec=deskflow" - ''; - qtWrapperArgs = [ "--set QT_QPA_PLATFORM_PLUGIN_PATH ${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}/platforms" ]; + doCheck = true; + + checkPhase = '' + runHook preCheck + + export QT_QPA_PLATFORM=offscreen + export HOME=$(mktemp -d) + ./bin/unittests + ./bin/integtests + + runHook postCheck + ''; + meta = { homepage = "https://github.com/deskflow/deskflow"; description = "Share one mouse and keyboard between multiple computers on Windows, macOS and Linux"; mainProgram = "deskflow"; maintainers = with lib.maintainers; [ aucub ]; - license = lib.licenses.gpl2Plus; + license = with lib; [ + licenses.gpl2Plus + licenses.openssl + ]; platforms = lib.platforms.linux; }; }