mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-22 13:41:26 +00:00
Code Issues Wiki Activity

Merge pull request #1734 from ocharles/network-manager

Browse source 
NetworkManager: Fix aliases and dependencies
This commit is contained in:
Domen Kožar 2014-02-12 12:35:43 +01:00
parent 7271eb50e6 625b42838a
commit adf007be2b
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/networkmanager.nix
View file

@ -89,7 +89,7 @@ in {
to change network settings to this group.
'';
};
packages = mkOption {
type = types.listOf types.path;
default = [ ];
@ -178,7 +178,7 @@ in {
description = "NetworkManager initialisation";
wantedBy = [ "network.target" ];
partOf = [ "NetworkManager.service" ];
wants = [ "ModemManager.service" ];
wants = [ "ModemManager.service" "NetworkManager.service" ];
before = [ "NetworkManager.service" ];
script = ''
mkdir -m 700 -p /etc/NetworkManager/system-connections

8
pkgs/tools/networking/network-manager/default.nix
View file

@ -57,12 +57,14 @@ stdenv.mkDerivation rec {
postInstall =
''
mkdir -p $out/lib/NetworkManager
# FIXME: Workaround until NixOS' dbus+systemd supports at_console policy
substituteInPlace $out/etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf --replace 'at_console="true"' 'group="networkmanager"'
# As NixOS doesn't seem to handle systemd Aliases, we just rename the dispatcher service file
mv $out/etc/systemd/system/NetworkManager-dispatcher.service $out/etc/systemd/system/dbus-org.freedesktop.nm-dispatcher.service
# 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
'';
meta = with stdenv.lib; {