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

meson: use correct prefix for systemd dirs
42a01822 · Naïm Favier · Max Kellermann · 38f1237d · 42a01822 · 42a01822
Commit 42a01822 authored May 22, 2023 by Naïm Favier Committed by Max Kellermann Jun 02, 2023
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 2 deletions

NEWS NEWS +1 -0

meson.build systemd/system/meson.build +4 -1

meson.build systemd/user/meson.build +4 -1

No files found.
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@ ver 0.23.14 (not yet released)
 * mixer
  - wasapi: fix problem setting volume
 * more libfmt 10 fixes
+* fix auto-detected systemd unit directory

 ver 0.23.13 (2023/05/22)
 * input

--- a/systemd/system/meson.build
+++ b/systemd/system/meson.build
@@ -2,7 +2,10 @@ systemd_system_unit_dir = get_option('systemd_system_unit_dir')
 if systemd_system_unit_dir == ''
  systemd = dependency('systemd', required: false)
  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
 if systemd_system_unit_dir == ''

--- a/systemd/user/meson.build
+++ b/systemd/user/meson.build
@@ -2,7 +2,10 @@ systemd_user_unit_dir = get_option('systemd_user_unit_dir')
 if systemd_user_unit_dir == ''
  systemd = dependency('systemd', required: false)
  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
 if systemd_user_unit_dir == ''