diff options
| author | Peter Simons <simons@cryp.to> | 2013-01-04 21:00:53 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2013-01-04 21:00:53 +0100 |
| commit | 9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2 (patch) | |
| tree | 366107df9c9c85749c9c601ba6a9115f7714badd /pkgs/tools/networking/network-manager | |
| parent | 7505cb5f9a3e92b864f36f1f52ee63caaa8b40af (diff) | |
| parent | 440bc6ec2a17697b379a637b9e84a274bec3a719 (diff) | |
| download | nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.gz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.bz2 nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.lz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.xz nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.tar.zst nixlib-9e9cd7b5293bb3b8bc6c6b547a0baf8d03b7e1e2.zip | |
Merge branch '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, 5 insertions, 3 deletions
diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 443e4182a777..2a86d416e166 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "network-manager-${version}"; - version = "0.9.4.0"; + version = "0.9.6.4"; src = fetchurl { url = "mirror://gnome/sources/NetworkManager/0.9/NetworkManager-${version}.tar.xz"; - sha256 = "eb4f124008b3d855a37205d03ef035b7218639cd7332bdae5567095977e93e0f"; + sha256 = "1sx7h29j9h13qszcppja1p27zq2m7vdrylbcyb47n62x0lg426si"; }; preConfigure = '' @@ -29,7 +29,9 @@ stdenv.mkDerivation rec { "--without-resolvconf" "--sysconfdir=/etc" "--localstatedir=/var" "--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-kernel-firmware-dir=/run/current-system/firmware" ]; buildInputs = [ wirelesstools udev libnl libuuid polkit ppp xz ]; |