From 5bb6fa384dbde557077f1d7f9a4949d962513cc4 Mon Sep 17 00:00:00 2001 From: Alex Date: Tue, 10 Sep 2019 12:06:06 +0200 Subject: [PATCH] Revert "service file: allow for waybar installed in different prefix" --- meson.build | 9 ++------- resources/{waybar.service.in => waybar.service} | 2 +- 2 files changed, 3 insertions(+), 8 deletions(-) rename resources/{waybar.service.in => waybar.service} (89%) diff --git a/meson.build b/meson.build index b25e9ce9..33c3f5f7 100644 --- a/meson.build +++ b/meson.build @@ -66,13 +66,8 @@ systemd = dependency('systemd', required: get_option('systemd')) if systemd.found() user_units_dir = systemd.get_pkgconfig_variable('systemduserunitdir') - - configure_file( - configuration: config, - input: './resources/waybar.service.in', - output: '@BASENAME@', - install_dir: user_units_dir - ) + install_data('./resources/waybar.service', + install_dir: user_units_dir) endif src_files = files( diff --git a/resources/waybar.service.in b/resources/waybar.service similarity index 89% rename from resources/waybar.service.in rename to resources/waybar.service index 1c086bfa..5eee4aaf 100644 --- a/resources/waybar.service.in +++ b/resources/waybar.service @@ -6,7 +6,7 @@ PartOf=wayland-session.target [Service] Type=dbus BusName=fr.arouillard.waybar -ExecStart=@prefix@/bin/waybar +ExecStart=/usr/bin/waybar [Install] WantedBy=wayland-session.target