diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2013-01-22 23:23:53 +0100 |
commit | 0a47a28f1df3bdf7b2cf074af84a432aa48cbba7 (patch) | |
tree | 6c953c0d58cf6d178795383fefe9babddaa7da4e /pkgs/tools/networking/network-manager | |
parent | 3e2e62ca31311dd7e5237aa97a815458a44a3a3e (diff) | |
parent | 296cd6600943d5a349cda55a36137331f8c3eec8 (diff) | |
download | nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.gz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.bz2 nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.lz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.xz nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.tar.zst nixlib-0a47a28f1df3bdf7b2cf074af84a432aa48cbba7.zip |
Merge remote-tracking branch 'origin/master' into stdenv-updates
Diffstat (limited to 'pkgs/tools/networking/network-manager')
-rw-r--r-- | pkgs/tools/networking/network-manager/default.nix | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 2a86d416e166..d9e73a706dbe 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -31,7 +31,8 @@ stdenv.mkDerivation rec { "--with-dbus-sys-dir=\${out}/etc/dbus-1/system.d" "--with-crypto=gnutls" "--disable-more-warnings" "--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 ]; @@ -55,11 +56,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"' ''; meta = with stdenv.lib; { homepage = http://projects.gnome.org/NetworkManager/; - description = "Network configuration and management in an easy way. Desktop environment independent."; + description = "Network configuration and management tool"; license = licenses.gpl2Plus; maintainers = with maintainers; [ phreedom urkud rickynils ]; platforms = platforms.linux; |