diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2023-11-07 20:35:24 +0100 |
|---|---|---|
| committer | Francesco Gazzetta <fgaz@fgaz.me> | 2023-11-21 08:00:48 +0000 |
| commit | 37e6adc926fc74e270e86a544a41aecabb0effb1 (patch) | |
| tree | 07759315a3568009898eec075da6536dc124302b | |
| parent | d1a2cdd3220abdae6995c2c27bdb3a25b41d519f (diff) | |
dayon: 12.0.1 -> 13.0.0
Diff: https://github.com/RetGal/dayon/compare/v12.0.1...v13.0.0
| -rw-r--r-- | pkgs/applications/networking/remote/dayon/default.nix | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/pkgs/applications/networking/remote/dayon/default.nix b/pkgs/applications/networking/remote/dayon/default.nix index 8af457c7d4c24..843322df55f03 100644 --- a/pkgs/applications/networking/remote/dayon/default.nix +++ b/pkgs/applications/networking/remote/dayon/default.nix @@ -10,21 +10,15 @@ stdenv.mkDerivation rec { pname = "dayon"; - version = "12.0.1"; + version = "13.0.0"; src = fetchFromGitHub { owner = "RetGal"; repo = "dayon"; rev = "v${version}"; - hash = "sha256-SCInonMTvBXtiDxWlN8QWNS+8MFB52vloonqfLcAEis="; + hash = "sha256-2Fo+LQvsrDvqEudZxzQBtJHGxrRYUyNyhrPV1xS49pQ="; }; - # https://github.com/RetGal/Dayon/pull/66 - postPatch = '' - substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \ - --replace "Exec=/usr/bin/" "Exec=" - ''; - nativeBuildInputs = [ ant jdk @@ -47,11 +41,15 @@ stdenv.mkDerivation rec { runHook preInstall install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar mkdir -p $out/bin + # jre is in PATH because dayon needs keytool to generate certificates makeWrapper ${jre}/bin/java $out/bin/dayon \ + --prefix PATH : "${lib.makeBinPath [ jre ]}" \ --add-flags "-jar $out/share/dayon/dayon.jar" makeWrapper ${jre}/bin/java $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 \ + --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 runHook postInstall |