From 98d06f8dd53452ee1406b2a3f224efb16239c4db Mon Sep 17 00:00:00 2001
From: Nicolas Werner <nicolas.werner@ymail.com>
Date: Tue, 19 Apr 2022 02:58:59 +0200
Subject: [PATCH] Fix install of desktop file in flatpak
---
CMakeLists.txt | 3 ++-
resources/{nheko.desktop => nheko.desktop.in} | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
rename resources/{nheko.desktop => nheko.desktop.in} (91%)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a8b1f11b0..c2fa0741d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -747,9 +747,10 @@ if(UNIX AND NOT APPLE)
install (FILES "resources/nheko-256.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/256x256/apps" RENAME "${APPID}.png")
install (FILES "resources/nheko-512.png" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/512x512/apps" RENAME "${APPID}.png")
install (FILES "resources/nheko.svg" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps" RENAME "${APPID}.svg")
- install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" RENAME "${APPID}.desktop")
install (FILES "resources/_nheko" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/zsh/site-functions")
+ configure_file("resources/nheko.desktop.in" "resources/nheko.desktop" @ONLY)
+ install (FILES "resources/nheko.desktop" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" RENAME "${APPID}.desktop")
configure_file("resources/nheko.appdata.xml.in" "resources/nheko.appdata.xml" @ONLY)
install (FILES "resources/nheko.appdata.xml" DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/metainfo" RENAME "${APPID}.appdata.xml")
diff --git a/resources/nheko.desktop b/resources/nheko.desktop.in
similarity index 91%
rename from resources/nheko.desktop
rename to resources/nheko.desktop.in
index e7da86bdc..ae0d788af 100644
--- a/resources/nheko.desktop
+++ b/resources/nheko.desktop.in
@@ -2,11 +2,11 @@
Name=nheko
Version=1.0
Comment=Desktop client for Matrix
-Exec=nheko %u
-Icon=nheko
+Exec=@APPID@ %u
+Icon=@APPID@
Type=Application
Categories=Network;InstantMessaging;Qt;
-StartupWMClass=nheko
+StartupWMClass=@APPID@
Terminal=false
MimeType=x-scheme-handler/matrix;
X-GNOME-UsesNotifications=true
--
GitLab