Fix wrong path in desktop file (LizardByte#2223)

Co-authored-by: ReenigneArcher <[email protected]>
KuleRucket · Jun 6, 2024 · 77f06b8 · 77f06b8
1 parent 975b317
commit 77f06b8
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/cmake/packaging/unix.cmake b/cmake/packaging/unix.cmake
@@ -1,8 +1,6 @@
 # unix specific packaging
 # put anything here that applies to both linux and macos
 
-include(GNUInstallDirs)
-
 # return here if building a macos package
 if(SUNSHINE_PACKAGE_MACOS)
     return()

diff --git a/cmake/prep/special_package_configuration.cmake b/cmake/prep/special_package_configuration.cmake
@@ -3,6 +3,8 @@ if (APPLE)
         configure_file(packaging/macos/Portfile Portfile @ONLY)
     endif()
 elseif (UNIX)
+    include(GNUInstallDirs)  # this needs to be included prior to configuring the desktop files
+
     # configure the .desktop file
     if(${SUNSHINE_BUILD_APPIMAGE})
         configure_file(packaging/linux/AppImage/sunshine.desktop sunshine.desktop @ONLY)

diff --git a/packaging/linux/flatpak/sunshine.desktop b/packaging/linux/flatpak/sunshine.desktop
@@ -12,9 +12,9 @@ Actions=RunInTerminal;KMS;
 [Desktop Action RunInTerminal]
 Name=Run in Terminal
 Icon=application-x-executable
-Exec=gio launch @CMAKE_INSTALL_DATAROOTDIR@/applications/sunshine_terminal.desktop
+Exec=gio launch @CMAKE_INSTALL_FULL_DATAROOTDIR@/applications/sunshine_terminal.desktop
 
 [Desktop Action KMS]
 Name=Run in Terminal (KMS)
 Icon=application-x-executable
-Exec=gio launch @CMAKE_INSTALL_DATAROOTDIR@/applications/sunshine_kms.desktop
+Exec=gio launch @CMAKE_INSTALL_FULL_DATAROOTDIR@/applications/sunshine_kms.desktop
diff --git a/packaging/linux/sunshine.desktop b/packaging/linux/sunshine.desktop
@@ -12,4 +12,4 @@ Actions=RunInTerminal;
 [Desktop Action RunInTerminal]
 Name=Run in Terminal
 Icon=application-x-executable
-Exec=gio launch @CMAKE_INSTALL_DATAROOTDIR@/applications/sunshine_terminal.desktop
+Exec=gio launch @CMAKE_INSTALL_FULL_DATAROOTDIR@/applications/sunshine_terminal.desktop