From 81874bfc8c1a0f2724a075a9fc0983415f9791b4 Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Wed, 20 Nov 2024 22:20:38 +0100 Subject: [PATCH] dayon: 14.0.2 -> 15.0.0 https://github.com/RetGal/Dayon/releases/tag/v15.0.0 --- pkgs/by-name/da/dayon/package.nix | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/pkgs/by-name/da/dayon/package.nix b/pkgs/by-name/da/dayon/package.nix index d183a9256730a..722bc175d3df2 100644 --- a/pkgs/by-name/da/dayon/package.nix +++ b/pkgs/by-name/da/dayon/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dayon"; - version = "14.0.2"; + version = "15.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${finalAttrs.version}"; - hash = "sha256-nRNqubR44ydZwwuQG3q6TRm+MHTRgRbeLI9dsk83wq4="; + hash = "sha256-Tnw1Tr+iRxvHFzSICwOcf4mErNx+imD7/WxVspiR7yo="; }; nativeBuildInputs = [ @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar # jre is in PATH because dayon needs keytool to generate certificates - makeWrapper ${jre}/bin/java $out/bin/dayon \ + makeWrapper ${lib.getExe jre} $out/bin/dayon \ --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-jar $out/share/dayon/dayon.jar" - makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \ + makeWrapper ${lib.getExe jre} $out/bin/dayon_assisted \ --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner" - makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \ + makeWrapper ${lib.getExe jre} $out/bin/dayon_assistant \ --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner" install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png @@ -54,21 +54,16 @@ stdenv.mkDerivation (finalAttrs: { ''; desktopItems = [ - "resources/deb/dayon_assisted.desktop" - "resources/deb/dayon_assistant.desktop" + "debian/dayon_assisted.desktop" + "debian/dayon_assistant.desktop" ]; - postFixup = '' - substituteInPlace $out/share/applications/*.desktop \ - --replace "/usr/bin/dayon/dayon.png" "dayon" - ''; - - meta = with lib; { + meta = { description = "Easy to use, cross-platform remote desktop assistance solution"; homepage = "https://retgal.github.io/Dayon/index.html"; - license = licenses.gpl3Plus; # https://github.com/RetGal/Dayon/issues/59 + license = lib.licenses.gpl3Plus; # https://github.com/RetGal/Dayon/issues/59 mainProgram = "dayon"; - maintainers = with maintainers; [ fgaz ]; - platforms = platforms.all; + maintainers = with lib.maintainers; [ fgaz ]; + platforms = lib.platforms.all; }; })