git.iko.soy/typeable/nixpkgs
on master help sign in
iwd: 0.19 -> 0.20

* don't use deprecated dbus directory * alphabetize * drop Mic92 from maintainers https://github.com/NixOS/nixpkgs/pull/68063#discussion_r323113385 * enableParallelBuilding Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>

commitaaf0ccfa4da6d1413de9886ec26565d635beda44 authorWill Dietz <w@wdtz.org> dateTue 3 Sep 2019, 19:38 (7 years ago) parentf0779e4
1 file changed+23−13
pkgs/os-specific/linux/iwd/default.nix+23−13
pkgs/os-specific/linux/iwd/default.nix+23−13
@@ -1,14 +1,22 @@
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
1422 nativeBuildInputs = [
@@ -19,8 +27,8 @@ stdenv.mkDerivation rec {
1927
2028 buildInputs = [
2129 ell
22− readline
2330 python3Packages.python
31+ readline
2432 ];
2533
2634 pythonPath = [
@@ -29,13 +37,13 @@ stdenv.mkDerivation rec {
2937 ];
3038
3139 configureFlags = [
32− "--with-dbus-datadir=${placeholder "out"}/etc/"
40+ "--enable-external-ell"
41+ "--enable-wired"
42+ "--localstatedir=/var/"
3343 "--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
34− "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
44+ "--with-dbus-datadir=${placeholder "out"}/share/"
3545 "--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
36− "--localstatedir=/var/"
37− "--enable-wired"
38− "--enable-external-ell"
46+ "--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
3947 ];
4048
4149 postUnpack = ''
@@ -55,16 +63,18 @@ stdenv.mkDerivation rec {
5563
5664 postFixup = ''
5765 substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
58− --replace /bin/false ${coreutils}/bin/false
66+ --replace /bin/false ${coreutils}/bin/false
5967 substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
60− --replace /bin/false ${coreutils}/bin/false
68+ --replace /bin/false ${coreutils}/bin/false
6169 '';
6270
71+ enableParallelBuilding = true;
72+
6373 meta = with stdenv.lib; {
6474 homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
6575 description = "Wireless daemon for Linux";
6676 license = licenses.lgpl21;
6777 platforms = platforms.linux;
68− maintainers = [ maintainers.mic92 ];
78+ maintainers = with maintainers; [ dtzWill ];
6979 };
7080}