JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iwd: 0.4 -> 0.7

Browse Source
This commit is contained in:
Vladyslav Mykhailichenko 2018-08-25 15:26:52 +03:00
parent 2c1e736ae8
commit d73fd69952
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
nixos/modules/services/networking/iwd.nix
View File

@ -20,14 +20,7 @@ in {
services.dbus.packages = [ pkgs.iwd ]; services.dbus.packages = [ pkgs.iwd ];
systemd.services.iwd = { systemd.packages = [ pkgs.iwd ];
description = "Wireless daemon";
before = [ "network.target" ];
wants = [ "network.target" ];
wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
};
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules = [
"d /var/lib/iwd 0700 root root -" "d /var/lib/iwd 0700 root root -"

20
pkgs/os-specific/linux/iwd/default.nix
View File

@ -1,19 +1,19 @@
{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }: { stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }:
let let
ell = fetchgit { ell = fetchgit {
url = https://git.kernel.org/pub/scm/libs/ell/ell.git; url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
rev = "0.7"; rev = "0.9";
sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "iwd-${version}"; name = "iwd-${version}";
version = "0.4"; version = "0.7";
src = fetchgit { src = fetchgit {
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
rev = version; rev = version;
sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -35,8 +35,9 @@ in stdenv.mkDerivation rec {
configureFlags = [ configureFlags = [
"--with-dbus-datadir=$(out)/etc/" "--with-dbus-datadir=$(out)/etc/"
"--localstatedir=/var" "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
"--disable-systemd-service" "--with-systemd-unitdir=$(out)/lib/systemd/system/"
"--localstatedir=/var/"
]; ];
postUnpack = '' postUnpack = ''
@ -55,6 +56,11 @@ in stdenv.mkDerivation rec {
wrapPythonPrograms wrapPythonPrograms
''; '';
postFixup = ''
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
--replace /bin/false ${coreutils}/bin/false
'';
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
description = "Wireless daemon for Linux"; description = "Wireless daemon for Linux";