From 1c8d21c2d69eac01d14ae0d09ea9c74e4ae2f3d3 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 12 Jan 2024 16:05:01 +0100 Subject: [PATCH 1/2] fluffychat: set meta.mainProgram --- .../networking/instant-messengers/fluffychat/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index cfe0bb8e8ab2..c85eba631cef 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -39,6 +39,7 @@ flutter313.buildFlutterApplication (rec { description = "Chat with your friends (matrix client)"; homepage = "https://fluffychat.im/"; license = licenses.agpl3Plus; + mainProgram = "fluffychat"; maintainers = with maintainers; [ mkg20001 gilice ]; platforms = [ "x86_64-linux" "aarch64-linux" ]; sourceProvenance = [ sourceTypes.fromSource ]; From 799702f2e704f2ee68b4334cb3d2d246f1aebd5f Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 9 Jan 2024 22:14:20 +0100 Subject: [PATCH 2/2] fluffychat: don't hardcode path in .desktop file This allows wrapping the binary in a separate derivation without touching the .desktop file. --- .../networking/instant-messengers/fluffychat/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix index c85eba631cef..0f31633cbccd 100644 --- a/pkgs/applications/networking/instant-messengers/fluffychat/default.nix +++ b/pkgs/applications/networking/instant-messengers/fluffychat/default.nix @@ -55,7 +55,7 @@ flutter313.buildFlutterApplication (rec { desktopItem = makeDesktopItem { name = "Fluffychat"; - exec = "@out@/bin/fluffychat"; + exec = "fluffychat"; icon = "fluffychat"; desktopName = "Fluffychat"; genericName = "Chat with your friends (matrix client)"; @@ -74,8 +74,6 @@ flutter313.buildFlutterApplication (rec { mkdir -p $D convert $FAV -resize ''${size}x''${size} $D/fluffychat.png done - substituteInPlace $out/share/applications/*.desktop \ - --subst-var out patchelf --add-rpath ${libwebrtcRpath} $out/app/lib/libwebrtc.so '';