@@ -1,16 +1,34 @@
1−{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }:
1+{ stdenv
2+, fetchgit
3+, fetchpatch
4+, autoreconfHook
5+, pkgconfig
6+, ell
7+, coreutils
8+, readline
9+, python3Packages
10+}:
211
312stdenv.mkDerivation rec {
413 pname = "iwd";
5−
6− version = "0.19";
14+ version = "0.20";
715
816 src = fetchgit {
917 url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
1018 rev = version;
11− sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz";
19+ sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf";
1220 };
1321
22+ patches = [
23+ # Undo creating ReadWritePaths as instalation target.
24+ (fetchpatch {
25+ name = "revert-create-dirs-on-install.patch";
26+ url = "https://git.kernel.org/pub/scm/network/wireless/iwd.git/patch/?id=5a96c11664eb553bc28a2142af382b190254edbb";
27+ sha256 = "08gkz3ia1l5xsh3pbx4abimgf7m88wygfpfyg77yi6dwavjqm6cx";
28+ revert = true;
29+ })
30+ ];
31+
1432 nativeBuildInputs = [
1533 autoreconfHook
1634 pkgconfig
@@ -19,8 +37,8 @@ stdenv.mkDerivation rec {
1937
2038 buildInputs = [
2139 ell
22− readline
2340 python3Packages.python
41+ readline
2442 ];
2543
2644 pythonPath = [
@@ -29,13 +47,13 @@ stdenv.mkDerivation rec {
2947 ];
3048
3149 configureFlags = [
32− "--with-dbus-datadir=${placeholder "out"}/etc/"
50+ "--enable-external-ell"
51+ "--enable-wired"
52+ "--localstatedir=/var/"
3353 "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
34− "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
54+ "--with-dbus-datadir=${placeholder "out"}/share/"
3555 "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
36− "--localstatedir=/var/"
37− "--enable-wired"
38− "--enable-external-ell"
56+ "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
3957 ];
4058
4159 postUnpack = ''
@@ -55,16 +73,18 @@ stdenv.mkDerivation rec {
5573
5674 postFixup = ''
5775 substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
58− --replace /bin/false ${coreutils}/bin/false
76+ --replace /bin/false ${coreutils}/bin/false
5977 substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
60− --replace /bin/false ${coreutils}/bin/false
78+ --replace /bin/false ${coreutils}/bin/false
6179 '';
6280
81+ enableParallelBuilding = true;
82+
6383 meta = with stdenv.lib; {
6484 homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
6585 description = "Wireless daemon for Linux";
6686 license = licenses.lgpl21;
6787 platforms = platforms.linux;
68− maintainers = [ maintainers.mic92 ];
88+ maintainers = with maintainers; [ dtzWill ];
6989 };
7090}