From 83edf5a626499b3d777401ebac2058463d6b143b Mon Sep 17 00:00:00 2001 From: seth Date: Sun, 18 Aug 2024 06:02:12 -0400 Subject: [PATCH] kiwitalk: use cargo-tauri.hook --- pkgs/by-name/ki/kiwitalk/package.nix | 32 +++++++--------------------- 1 file changed, 8 insertions(+), 24 deletions(-) diff --git a/pkgs/by-name/ki/kiwitalk/package.nix b/pkgs/by-name/ki/kiwitalk/package.nix index efc9c55337d3..b700b198bc37 100644 --- a/pkgs/by-name/ki/kiwitalk/package.nix +++ b/pkgs/by-name/ki/kiwitalk/package.nix @@ -1,16 +1,15 @@ { lib , fetchFromGitHub -, copyDesktopItems , stdenv , rustc , rustPlatform , cargo , cargo-tauri +, desktop-file-utils , openssl , libayatana-appindicator , webkitgtk , pkg-config -, makeDesktopItem , pnpm , nodejs }: @@ -49,10 +48,10 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook cargo rustc - cargo-tauri + cargo-tauri.hook + desktop-file-utils nodejs pnpm.configHook - copyDesktopItems pkg-config ]; @@ -62,28 +61,13 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk ]; - preBuild = '' - cargo tauri build -b deb + postInstall = lib.optionalString stdenv.isLinux '' + desktop-file-edit \ + --set-comment "An UNOFFICIAL cross-platform KakaoTalk client" \ + --set-key="Categories" --set-value="Network;InstantMessaging;" \ + $out/share/applications/kiwi-talk.desktop ''; - preInstall = '' - mv target/release/bundle/deb/*/data/usr/ $out - # delete the generated desktop entry - rm -r $out/share/applications - ''; - - desktopItems = [ - (makeDesktopItem { - name = "KiwiTalk"; - exec = "kiwi-talk"; - icon = "kiwi-talk"; - desktopName = "KiwiTalk"; - comment = "An UNOFFICIAL cross-platform KakaoTalk client"; - categories = [ "Network" "InstantMessaging" ]; - terminal = false; - }) - ]; - meta = with lib; { description = "UNOFFICIAL cross-platform KakaoTalk client written in TypeScript & Rust (SolidJS, tauri)"; homepage = "https://github.com/KiwiTalk/KiwiTalk";