oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

meson: use correct prefix for systemd dirs 

See https://www.bassi.io/articles/2018/03/15/pkg-config-and-paths/

Fixes the build in nixpkgs
This commit is contained in:
Naïm Favier 2023-05-22 22:23:38 +02:00 committed by Max Kellermann
parent 38f1237d49
commit 42a01822bf
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -5,6 +5,7 @@ ver 0.23.14 (not yet released)
* mixer * mixer
- wasapi: fix problem setting volume - wasapi: fix problem setting volume
* more libfmt 10 fixes * more libfmt 10 fixes
* fix auto-detected systemd unit directory
ver 0.23.13 (2023/05/22) ver 0.23.13 (2023/05/22)
* input * input

5
systemd/system/meson.build
View File

@ -2,7 +2,10 @@ systemd_system_unit_dir = get_option('systemd_system_unit_dir')
if systemd_system_unit_dir == '' if systemd_system_unit_dir == ''
systemd = dependency('systemd', required: false) systemd = dependency('systemd', required: false)
if systemd.found() if systemd.found()
systemd_system_unit_dir = systemd.get_variable(pkgconfig: 'systemdsystemunitdir') systemd_system_unit_dir = systemd.get_variable(
pkgconfig: 'systemdsystemunitdir',
pkgconfig_define: ['prefix', get_option('prefix')],
)
endif endif
endif endif
if systemd_system_unit_dir == '' if systemd_system_unit_dir == ''

5
systemd/user/meson.build
View File

@ -2,7 +2,10 @@ systemd_user_unit_dir = get_option('systemd_user_unit_dir')
if systemd_user_unit_dir == '' if systemd_user_unit_dir == ''
systemd = dependency('systemd', required: false) systemd = dependency('systemd', required: false)
if systemd.found() if systemd.found()
systemd_user_unit_dir = systemd.get_variable(pkgconfig: 'systemduserunitdir') systemd_user_unit_dir = systemd.get_variable(
pkgconfig: 'systemduserunitdir',
pkgconfig_define: ['prefix', get_option('prefix')],
)
endif endif
endif endif
if systemd_user_unit_dir == '' if systemd_user_unit_dir == ''