diff options
| author | worldofpeace <worldofpeace@protonmail.ch> | 2019-09-14 08:04:28 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-14 08:04:28 -0400 |
| commit | 3cb0ae999fd45f6f1f4eae4fac3b62c2905db9f4 (patch) | |
| tree | 4f16994b46e4d942aae5703911c231ad440fef7c /pkgs/tools/networking | |
| parent | e8bc2a6ac089c43e5a9c55a21074529bb12ed82c (diff) | |
Revert "networkmanager,modemmanager: fix service symlinks for systemd v243"
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/modem-manager/default.nix | 7 | ||||
| -rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 5 |
2 files changed, 12 insertions, 0 deletions
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix index fedc8d4b71d7..b2644d0c2a49 100644 --- a/pkgs/tools/networking/modem-manager/default.nix +++ b/pkgs/tools/networking/modem-manager/default.nix @@ -32,6 +32,13 @@ stdenv.mkDerivation rec { doCheck = true; + postInstall = '' + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/ModemManager.service \ + $out/etc/systemd/system/dbus-org.freedesktop.ModemManager1.service + ''; + meta = with stdenv.lib; { description = "WWAN modem manager, part of NetworkManager"; homepage = https://www.freedesktop.org/wiki/Software/ModemManager/; diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 490ebd0fa6bb..5bc915caea65 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -97,6 +97,11 @@ in stdenv.mkDerivation rec { ''; postInstall = '' + # systemd in NixOS doesn't use `systemctl enable`, so we need to establish + # aliases ourselves. + ln -s $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service + ln -s $out/etc/systemd/system/NetworkManager.service $out/etc/systemd/system/dbus-org.freedesktop.NetworkManager.service + # Add the legacy service name from before #51382 to prevent NetworkManager # from not starting back up: # TODO: remove this once 19.10 is released |