aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPino Toscano <toscano.pino@tiscali.it>2021-05-27 22:37:24 +0200
committerGitHub <noreply@github.com>2021-05-27 22:37:24 +0200
commit192ea01eddbc7508055f855f2afc4dd397d992b1 (patch)
tree03b10cb8286af493d06cb57d0c0c6c5b9624fc63
parent192f89ea1bdb86e8d12a9940872f92f0fc88b300 (diff)
downloadrneovim-192ea01eddbc7508055f855f2afc4dd397d992b1.tar.gz
rneovim-192ea01eddbc7508055f855f2afc4dd397d992b1.tar.bz2
rneovim-192ea01eddbc7508055f855f2afc4dd397d992b1.zip
cmake: install app icon in XDG hicolor icon theme (#14656)
Install the icon of the application in the hicolor XDG icon theme; this way it can be properly loaded by XDG menus in the currently set XDG icon theme, without looking in the legacy pixmaps location.
-rw-r--r--runtime/CMakeLists.txt2
-rw-r--r--snap/snapcraft.yaml2
2 files changed, 2 insertions, 2 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt
index d66e04f5f2..4fdcfc0f33 100644
--- a/runtime/CMakeLists.txt
+++ b/runtime/CMakeLists.txt
@@ -111,7 +111,7 @@ if(NOT APPLE)
install_helper(
FILES ${CMAKE_CURRENT_SOURCE_DIR}/nvim.png
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/pixmaps)
+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/128x128/apps)
endif()
file(GLOB_RECURSE RUNTIME_PROGRAMS
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index 57bcb72d5d..fd57f2d5e4 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -69,7 +69,7 @@ parts:
# Fix Desktop file
sed -i 's|^Exec=nvim|Exec=/snap/bin/nvim.nvim|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/nvim.desktop
sed -i 's|^TryExec=nvim|TryExec=/snap/bin/nvim.nvim|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/nvim.desktop
- sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/pixmaps/nvim.png|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/nvim.desktop
+ sed -i 's|^Icon=.*|Icon=${SNAP}/usr/share/icons/hicolor/128x128/apps/nvim.png|' ${SNAPCRAFT_PART_INSTALL}/usr/share/applications/nvim.desktop
build-packages:
- ninja-build
- libtool