mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-25 03:17:13 +00:00
1ff3a0c498
* libnm-glib is gone 👋️ * correct dbus_conf_dir * remove legacy service symlink * upstream defaults to 'internal' for dhcp NixOS module reflects this. https://gitlab.freedesktop.org/NetworkManager/NetworkManager/blob/1.20.2/NEWS
30 lines
955 B
Diff
30 lines
955 B
Diff
diff --git a/meson.build b/meson.build
|
|
index 4105a9c80..3d912557f 100644
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -884,9 +884,9 @@ meson.add_install_script(
|
|
join_paths('tools', 'meson-post-install.sh'),
|
|
nm_datadir,
|
|
nm_bindir,
|
|
- nm_pkgconfdir,
|
|
+ nm_prefix + nm_pkgconfdir,
|
|
nm_pkglibdir,
|
|
- nm_pkgstatedir,
|
|
+ nm_prefix + nm_pkgstatedir,
|
|
enable_docs ? 'install_docs' : '',
|
|
nm_mandir,
|
|
)
|
|
diff --git a/src/settings/plugins/ifcfg-rh/meson.build b/src/settings/plugins/ifcfg-rh/meson.build
|
|
index 58acdcfcb..e3a16d597 100644
|
|
--- a/src/settings/plugins/ifcfg-rh/meson.build
|
|
+++ b/src/settings/plugins/ifcfg-rh/meson.build
|
|
@@ -69,7 +69,7 @@ install_data(
|
|
)
|
|
|
|
meson.add_install_script('sh', '-c',
|
|
- 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_sysconfdir))
|
|
+ 'mkdir -p $DESTDIR/@0@/sysconfig/network-scripts'.format(nm_prefix + nm_sysconfdir))
|
|
|
|
if enable_tests
|
|
subdir('tests')
|