diff options
| author | Vladyslav Mykhailichenko <dywedir@pm.me> | 2018-08-25 15:26:52 +0300 |
|---|---|---|
| committer | Vladyslav Mykhailichenko <dywedir@pm.me> | 2018-08-25 15:26:52 +0300 |
| commit | d73fd699529aadd0c38931eceefa4c83f108fc34 (patch) | |
| tree | ddccbe5c5e1f8923c8a6a094bb107126d6e74ebc | |
| parent | 2c1e736ae8ea308cecc6b6f2cf44638280393363 (diff) | |
| download | nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar.gz nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar.bz2 nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar.lz nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar.xz nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.tar.zst nixpkgs-d73fd699529aadd0c38931eceefa4c83f108fc34.zip | |
iwd: 0.4 -> 0.7
| -rw-r--r-- | nixos/modules/services/networking/iwd.nix | 9 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 20 |
2 files changed, 14 insertions, 15 deletions
diff --git a/nixos/modules/services/networking/iwd.nix b/nixos/modules/services/networking/iwd.nix index cfc536fc5b5..eb03d2e1d63 100644 --- a/nixos/modules/services/networking/iwd.nix +++ b/nixos/modules/services/networking/iwd.nix @@ -20,14 +20,7 @@ in { services.dbus.packages = [ pkgs.iwd ]; - systemd.services.iwd = { - description = "Wireless daemon"; - before = [ "network.target" ]; - wants = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd"; - }; + systemd.packages = [ pkgs.iwd ]; systemd.tmpfiles.rules = [ "d /var/lib/iwd 0700 root root -" diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 833609f9fc2..79179f3fcbb 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }: +{ stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }: let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.7"; - sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; + rev = "0.9"; + sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p"; }; in stdenv.mkDerivation rec { name = "iwd-${version}"; - version = "0.4"; + version = "0.7"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; + sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab"; }; nativeBuildInputs = [ @@ -35,8 +35,9 @@ in stdenv.mkDerivation rec { configureFlags = [ "--with-dbus-datadir=$(out)/etc/" - "--localstatedir=/var" - "--disable-systemd-service" + "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/" + "--with-systemd-unitdir=$(out)/lib/systemd/system/" + "--localstatedir=/var/" ]; postUnpack = '' @@ -55,6 +56,11 @@ in stdenv.mkDerivation rec { wrapPythonPrograms ''; + postFixup = '' + substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \ + --replace /bin/false ${coreutils}/bin/false + ''; + meta = with stdenv.lib; { homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; description = "Wireless daemon for Linux"; |