about summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorworldofpeace <worldofpeace@protonmail.ch>2019-09-14 08:03:12 -0400
committerGitHub <noreply@github.com>2019-09-14 08:03:12 -0400
commite8bc2a6ac089c43e5a9c55a21074529bb12ed82c (patch)
tree120fe5109471ed09e13752d8775066deb4c4d1fb /pkgs/tools
parente06aa820c912127dc00d9b1395861feb0b484538 (diff)
parentf99bdb2b615da434e0f2814a5924a2aa6a7a1f66 (diff)
Merge pull request #68731 from dtzWill/fix/networkmanager-dbus-service-aliases
networkmanager,modemmanager: fix service symlinks for systemd v243
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/modem-manager/default.nix7
-rw-r--r--pkgs/tools/networking/network-manager/default.nix5
2 files changed, 0 insertions, 12 deletions
diff --git a/pkgs/tools/networking/modem-manager/default.nix b/pkgs/tools/networking/modem-manager/default.nix
index b2644d0c2a496..fedc8d4b71d7f 100644
--- a/pkgs/tools/networking/modem-manager/default.nix
+++ b/pkgs/tools/networking/modem-manager/default.nix
@@ -32,13 +32,6 @@ 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 5bc915caea650..490ebd0fa6bb0 100644
--- a/pkgs/tools/networking/network-manager/default.nix
+++ b/pkgs/tools/networking/network-manager/default.nix
@@ -97,11 +97,6 @@ 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