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

Merge pull request #44890 from dywedir/iwd

Browse Source 
iwd: 0.4 -> 0.7
This commit is contained in:
Jörg Thalheim 2018-08-26 17:25:42 +01:00 committed by GitHub
commit a78b364ed4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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 ];
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 -"

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
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";