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

Merge pull request #36440 from dywedir/iwd

Browse Source 
iwd: 2017-12-14 -> 0.1
This commit is contained in:
Matthew Justin Bauer 2018-04-17 10:53:37 -05:00 committed by GitHub
commit ef7f1c5e03
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ in {
wants = [ "network.target" ]; wants = [ "network.target" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig.ExecStart = "${pkgs.iwd}/bin/iwd"; serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd";
}; };
}; };

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

@ -3,16 +3,17 @@
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 = "8192131685be0f27d6f51b14b78ef93fa7f3c692"; rev = "0.4";
sha256 = "1k74qz3w0l4zq8llrxc4p62xy0c0n33f260vy3d14wx5rhvf0544"; sha256 = "0l203n1jnqa2mcifir8ydxhcvbiwlvk89ailm0lida83l9vdlwpv";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "iwd-unstable-2017-12-14"; name = "iwd-${version}";
version = "0.1";
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 = "cf3372235c4592ca7366b27548abc4e89a982414"; rev = version;
sha256 = "0dg28j919w1v8sqr6jdj12c233rsjzd2jzkcpag1hx2h3g35hnlz"; sha256 = "1f8c6xvcvqw8z78mskynd2fkghggcl7vfz8vxzvpx0fkqcprn5n0";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -24,7 +25,7 @@ in stdenv.mkDerivation rec {
readline readline
python3Packages.python python3Packages.python
]; ];
pythonPath = [ pythonPath = [
python3Packages.dbus-python python3Packages.dbus-python
python3Packages.pygobject3 python3Packages.pygobject3
@ -33,7 +34,8 @@ in stdenv.mkDerivation rec {
enableParallelBuilding = true; enableParallelBuilding = true;
configureFlags = [ configureFlags = [
"--with-dbusconfdir=$(out)/etc/" "--with-dbus-datadir=$(out)/etc/"
"--disable-systemd-service"
]; ];
postUnpack = '' postUnpack = ''