RPJosh
/
Waybar
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #460 from gdamjan/master 

service file: allow for waybar installed in different prefix
pull/465/head
Alex 2019-09-12 17:40:03 +02:00 committed by GitHub
parent 02811293e0 4b24c19fa7
commit db74a46d7b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
meson.build
View File

@ -64,10 +64,19 @@ libudev = dependency('libudev', required: get_option('libudev'))
libmpdclient = dependency('libmpdclient', required: get_option('mpd')) libmpdclient = dependency('libmpdclient', required: get_option('mpd'))
systemd = dependency('systemd', required: get_option('systemd')) systemd = dependency('systemd', required: get_option('systemd'))
prefix = get_option('prefix')
conf_data = configuration_data()
conf_data.set('prefix', prefix)
if systemd.found() if systemd.found()
user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir') user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir')
install_data('./resources/waybar.service',
install_dir: user_units_dir) configure_file(
configuration: conf_data,
input: './resources/waybar.service.in',
output: '@BASENAME@',
install_dir: user_units_dir
)
endif endif
src_files = files( src_files = files(

2
resources/waybar.service → resources/waybar.service.in
View File

@ -6,7 +6,7 @@ PartOf=wayland-session.target
[Service] [Service]
Type=dbus Type=dbus
BusName=fr.arouillard.waybar BusName=fr.arouillard.waybar
ExecStart=/usr/bin/waybar ExecStart=@prefix@/bin/waybar
[Install] [Install]
WantedBy=wayland-session.target WantedBy=wayland-session.target