From 52c0a717534c43fcb1c7dd5b54894f1e1bda92e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Tue, 26 Dec 2023 01:06:27 +0100 Subject: [PATCH 1/4] anydesk: use desktopItems, move passthru before meta (cherry picked from commit c21d0c384484712202bb9f5a69858739f31742f5) --- .../networking/remote/anydesk/default.nix | 57 +++++++++---------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 66b8f8d59bd8..1f60abbcf970 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -1,44 +1,22 @@ { lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, genericUpdater, writeShellScript , atk, cairo, gdk-pixbuf, glib, gnome2, gtk2, libGLU, libGL, pango, xorg, minizip -, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils +, lsb-release, freetype, fontconfig, polkit, polkit_gnome, pciutils, copyDesktopItems , pulseaudio }: let description = "Desktop sharing application, providing remote support and online meetings"; - - desktopItem = makeDesktopItem { - name = "AnyDesk"; - exec = "@out@/bin/anydesk %u"; - icon = "anydesk"; - desktopName = "AnyDesk"; - genericName = description; - categories = [ "Network" ]; - startupNotify = false; - }; - in stdenv.mkDerivation rec { pname = "anydesk"; version = "6.3.0"; src = fetchurl { urls = [ - "https://download.anydesk.com/linux/${pname}-${version}-amd64.tar.gz" - "https://download.anydesk.com/linux/generic-linux/${pname}-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" + "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; }; - passthru = { - updateScript = genericUpdater { - versionLister = writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' - ''; - }; - }; - buildInputs = [ atk cairo gdk-pixbuf glib gtk2 stdenv.cc.cc pango gnome2.gtkglext libGLU libGL minizip freetype @@ -48,7 +26,19 @@ in stdenv.mkDerivation rec { libXrandr libXtst libXt libICE libSM libXrender ]); - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ copyDesktopItems makeWrapper ]; + + desktopItems = [ + (makeDesktopItem { + name = "AnyDesk"; + exec = "${placeholder "out"}/bin/anydesk %u"; + icon = "anydesk"; + desktopName = "AnyDesk"; + genericName = description; + categories = [ "Network" ]; + startupNotify = false; + }) + ]; installPhase = '' runHook preInstall @@ -57,7 +47,6 @@ in stdenv.mkDerivation rec { install -m755 anydesk $out/bin/anydesk cp copyright README $out/share/doc/anydesk cp -r icons/hicolor/* $out/share/icons/hicolor/ - cp ${desktopItem}/share/applications/*.desktop $out/share/applications runHook postInstall ''; @@ -75,11 +64,19 @@ in stdenv.mkDerivation rec { wrapProgram $out/bin/anydesk \ --prefix PATH : ${lib.makeBinPath [ lsb-release pciutils ]} - - substituteInPlace $out/share/applications/*.desktop \ - --subst-var out ''; + passthru = { + updateScript = genericUpdater { + versionLister = writeShellScript "anydesk-versionLister" '' + curl -s https://anydesk.com/en/downloads/linux \ + | grep "https://[a-z0-9._/-]*-amd64.tar.gz" -o \ + | uniq \ + | sed 's,.*/anydesk-\(.*\)-amd64.tar.gz,\1,g' + ''; + }; + }; + meta = with lib; { inherit description; homepage = "https://www.anydesk.com"; From fea70f58d00ebe1d300fe28a8387597b85f9e8c4 Mon Sep 17 00:00:00 2001 From: John Garcia Date: Tue, 16 Jan 2024 12:06:36 +0000 Subject: [PATCH 2/4] anydesk: fix desktop file (cherry picked from commit ae8abf36cfcdad2ccc3bf3e9c4ca7089021c51e7) --- pkgs/applications/networking/remote/anydesk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 1f60abbcf970..5155e29a0bda 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation rec { desktopItems = [ (makeDesktopItem { name = "AnyDesk"; - exec = "${placeholder "out"}/bin/anydesk %u"; + exec = "anydesk %u"; icon = "anydesk"; desktopName = "AnyDesk"; genericName = description; From 12334f6ebdc5d0d69dd2d6573f48150c06ad5b0d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 20 Mar 2024 21:33:32 +0000 Subject: [PATCH 3/4] anydesk: 6.3.0 -> 6.3.1 (cherry picked from commit a7e26c5949710061c5ee1cb61829b254f432739c) --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 5155e29a0bda..08e428b18b07 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -7,14 +7,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.3.0"; + version = "6.3.1"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; - hash = "sha256-seMzfTXOGa+TljgpmIsgFOis+79r0bWt+4vH3Nb+5FI="; + hash = "sha256-qVksva6+EfAQiOexP8NlDSCR5Ab2WGsuCG4BD87rlag="; }; buildInputs = [ From 323bf57b0867ba7c06798c5c8a4e13cfb3de112c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 25 Apr 2024 20:19:16 +0000 Subject: [PATCH 4/4] anydesk: 6.3.1 -> 6.3.2 (cherry picked from commit 1af4a76beaf7403f816d42fc8ec85614be54d41c) --- pkgs/applications/networking/remote/anydesk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/anydesk/default.nix b/pkgs/applications/networking/remote/anydesk/default.nix index 08e428b18b07..5053de0ecb35 100644 --- a/pkgs/applications/networking/remote/anydesk/default.nix +++ b/pkgs/applications/networking/remote/anydesk/default.nix @@ -7,14 +7,14 @@ let description = "Desktop sharing application, providing remote support and online meetings"; in stdenv.mkDerivation rec { pname = "anydesk"; - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { urls = [ "https://download.anydesk.com/linux/anydesk-${version}-amd64.tar.gz" "https://download.anydesk.com/linux/generic-linux/anydesk-${version}-amd64.tar.gz" ]; - hash = "sha256-qVksva6+EfAQiOexP8NlDSCR5Ab2WGsuCG4BD87rlag="; + hash = "sha256-nSY4qHRsEvQk4M3JDHalAk3C6Y21WlfDQ2Gpp6/jjMs="; }; buildInputs = [