From 4e5773eeda27bc5eb25282693473940738a8525e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 2 Jun 2025 20:05:08 -0700 Subject: [PATCH] tail-tray: 0.2.22 -> 0.2.23 Diff: https://github.com/SneWs/tail-tray/compare/refs/tags/v0.2.22...refs/tags/v0.2.23 Changelog: https://github.com/SneWs/tail-tray/releases/tag/v0.2.23 --- pkgs/by-name/ta/tail-tray/desktop.patch | 16 ---------------- pkgs/by-name/ta/tail-tray/package.nix | 20 +++++++++++++------- 2 files changed, 13 insertions(+), 23 deletions(-) delete mode 100644 pkgs/by-name/ta/tail-tray/desktop.patch diff --git a/pkgs/by-name/ta/tail-tray/desktop.patch b/pkgs/by-name/ta/tail-tray/desktop.patch deleted file mode 100644 index 56162f2f4c01..000000000000 --- a/pkgs/by-name/ta/tail-tray/desktop.patch +++ /dev/null @@ -1,16 +0,0 @@ -diff --git a/tail-tray.desktop.in b/tail-tray.desktop.in -index 2d1c7be..5e859ae 100644 ---- a/tail-tray.desktop.in -+++ b/tail-tray.desktop.in -@@ -2,8 +2,8 @@ - Name=Tail Tray - GenericName=Tail Tray - Comment=Tailscale Tray Application --Exec=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/tail-tray --Icon=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_DATAROOTDIR@/icons/hicolor/128x128/apps/tailscale.png -+Exec=@CMAKE_INSTALL_PREFIX@/bin/tail-tray -+Icon=@CMAKE_INSTALL_PREFIX@/share/icons/hicolor/128x128/apps/tailscale.png - Type=Application - Categories=Qt;KDE;Utility;X-Networking;X-Internet;X-VPN; - StartupNotify=true - diff --git a/pkgs/by-name/ta/tail-tray/package.nix b/pkgs/by-name/ta/tail-tray/package.nix index e91844da2856..883285623381 100644 --- a/pkgs/by-name/ta/tail-tray/package.nix +++ b/pkgs/by-name/ta/tail-tray/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, davfs2, cmake, extra-cmake-modules, @@ -11,15 +12,24 @@ stdenv.mkDerivation rec { pname = "tail-tray"; - version = "0.2.22"; + version = "0.2.23"; src = fetchFromGitHub { owner = "SneWs"; repo = "tail-tray"; tag = "v${version}"; - sha256 = "sha256-1tYuZBJFIGwub3wJR/Ms1Dybhn3KMzKYrpgzZEXwqWU="; + hash = "sha256-fnr7EheVG3G4oLAe9liAy5qCDED/7eL0mUiE0qXsco4="; }; + patches = [ + # https://github.com/SneWs/tail-tray/pull/82 + (fetchpatch { + name = "dont-use-absoulte-paths-in-desktop-file.patch"; + url = "https://github.com/SneWs/tail-tray/commit/08aa4a4e061f21c2dcd07c94249f2eb15c4e4416.patch"; + hash = "sha256-6YOJes40e2rgVabYns55M5h1FGyFG+gjSewCaXesT8U="; + }) + ]; + nativeBuildInputs = with kdePackages; [ wrapQtAppsHook qttools @@ -39,14 +49,10 @@ stdenv.mkDerivation rec { "-DDAVFS_ENABLED=ON" ]; - patches = [ - ./desktop.patch - ]; - meta = { description = "Tray icon to manage Tailscale"; homepage = "https://github.com/SneWs/tail-tray"; - changelog = "https://github.com/SneWs/tail-tray/releases/tag/${version}"; + changelog = "https://github.com/SneWs/tail-tray/releases/tag/${src.tag}"; mainProgram = "tail-tray"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Svenum ];