NetworkManager: cooperate better with systemd
This commit is contained in:
parent
db292a74c0
commit
38a14fac65
@ -31,7 +31,8 @@ stdenv.mkDerivation rec {
|
|||||||
"--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
|
"--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d"
|
||||||
"--with-crypto=gnutls" "--disable-more-warnings"
|
"--with-crypto=gnutls" "--disable-more-warnings"
|
||||||
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
"--with-systemdsystemunitdir=$(out)/etc/systemd/system"
|
||||||
"--with-kernel-firmware-dir=/run/current-system/firmware" ];
|
"--with-kernel-firmware-dir=/run/current-system/firmware"
|
||||||
|
"--with-session-tracking=systemd" ];
|
||||||
|
|
||||||
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ];
|
buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ];
|
||||||
|
|
||||||
@ -55,6 +56,9 @@ stdenv.mkDerivation rec {
|
|||||||
postInstall =
|
postInstall =
|
||||||
''
|
''
|
||||||
mkdir -p $out/lib/NetworkManager
|
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"'
|
||||||
'';
|
'';
|
||||||
|
|
||||||
meta = with stdenv.lib; {
|
meta = with stdenv.lib; {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user