hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-15 07:46:01 +01:00
Code Issues Projects Releases Packages Wiki Activity

Lock uwsm desktop file behind feature flag

Browse source 
The file in the repo cannot be used in NixOS due to missing full paths,
and the fact that `uwsm` does not have access to `PATH` to find the
listed binaries. Might be useful in other situations as well.
This commit is contained in:
Mihai Fufezan 2024-11-11 10:05:01 +02:00
parent 943c7d18cc
commit ff411658e8
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CMakeLists.txt
View file

@ -224,8 +224,13 @@ else()
add_compile_definitions(USES_SYSTEMD) add_compile_definitions(USES_SYSTEMD)
# session file -uwsm # session file -uwsm
install(FILES ${CMAKE_SOURCE_DIR}/systemd/hyprland-uwsm.desktop if(NO_UWSM)
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/wayland-sessions) message(STATUS "UWSM support is disabled...")
else()
message(STATUS "UWSM support is enabled (NO_UWSM not defined)...")
install(FILES ${CMAKE_SOURCE_DIR}/systemd/hyprland-uwsm.desktop
DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/wayland-sessions)
endif()
endif() endif()
set(CPACK_PROJECT_NAME ${PROJECT_NAME}) set(CPACK_PROJECT_NAME ${PROJECT_NAME})

1
meson_options.txt
View file

@ -1,4 +1,5 @@
option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications') option('xwayland', type: 'feature', value: 'auto', description: 'Enable support for X11 applications')
option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration') option('systemd', type: 'feature', value: 'auto', description: 'Enable systemd integration')
option('uwsm', type: 'feature', value: 'enabled', description: 'Enable uwsm integration (only if systemd is enabled)')
option('legacy_renderer', type: 'feature', value: 'disabled', description: 'Enable legacy renderer') option('legacy_renderer', type: 'feature', value: 'disabled', description: 'Enable legacy renderer')
option('tracy_enable', type: 'boolean', value: false , description: 'Enable profiling') option('tracy_enable', type: 'boolean', value: false , description: 'Enable profiling')

12
systemd/meson.build
View file

@ -1,5 +1,7 @@
install_data( if (get_option('uwsm').allowed())
'hyprland-uwsm.desktop', install_data(
install_dir: join_paths(get_option('datadir'), 'wayland-sessions'), 'hyprland-uwsm.desktop',
install_tag: 'runtime', install_dir: join_paths(get_option('datadir'), 'wayland-sessions'),
) install_tag: 'runtime',
)
endif