mirror of
https://github.com/SebastianWendel/nixpkgs.git
synced 2024-09-22 13:29:00 +02:00
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>
This commit is contained in:
parent
f0779e4497
commit
aaf0ccfa4d
|
@ -1,14 +1,22 @@
|
|||
{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }:
|
||||
{ stdenv
|
||||
, fetchgit
|
||||
, fetchpatch
|
||||
, autoreconfHook
|
||||
, pkgconfig
|
||||
, ell
|
||||
, coreutils
|
||||
, readline
|
||||
, python3Packages
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "iwd";
|
||||
|
||||
version = "0.19";
|
||||
version = "0.20";
|
||||
|
||||
src = fetchgit {
|
||||
url = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
|
||||
rev = version;
|
||||
sha256 = "0848r06bnx5k6wlmy425hljc3f03x9xx0r83vdvf630jryc9llmz";
|
||||
sha256 = "03ca47d4hn28vkf5fr6ck1gz5py4lm1pw3nw9s1ckw7cqxw961sf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
@ -19,8 +27,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
buildInputs = [
|
||||
ell
|
||||
readline
|
||||
python3Packages.python
|
||||
readline
|
||||
];
|
||||
|
||||
pythonPath = [
|
||||
|
@ -29,13 +37,13 @@ stdenv.mkDerivation rec {
|
|||
];
|
||||
|
||||
configureFlags = [
|
||||
"--with-dbus-datadir=${placeholder "out"}/etc/"
|
||||
"--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
|
||||
"--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
|
||||
"--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
|
||||
"--localstatedir=/var/"
|
||||
"--enable-wired"
|
||||
"--enable-external-ell"
|
||||
"--enable-wired"
|
||||
"--localstatedir=/var/"
|
||||
"--with-dbus-busdir=${placeholder "out"}/share/dbus-1/system-services/"
|
||||
"--with-dbus-datadir=${placeholder "out"}/share/"
|
||||
"--with-systemd-modloaddir=${placeholder "out"}/etc/modules-load.d/" # maybe
|
||||
"--with-systemd-unitdir=${placeholder "out"}/lib/systemd/system/"
|
||||
];
|
||||
|
||||
postUnpack = ''
|
||||
|
@ -55,16 +63,18 @@ stdenv.mkDerivation rec {
|
|||
|
||||
postFixup = ''
|
||||
substituteInPlace $out/share/dbus-1/system-services/net.connman.ead.service \
|
||||
--replace /bin/false ${coreutils}/bin/false
|
||||
--replace /bin/false ${coreutils}/bin/false
|
||||
substituteInPlace $out/share/dbus-1/system-services/net.connman.iwd.service \
|
||||
--replace /bin/false ${coreutils}/bin/false
|
||||
--replace /bin/false ${coreutils}/bin/false
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git;
|
||||
description = "Wireless daemon for Linux";
|
||||
license = licenses.lgpl21;
|
||||
platforms = platforms.linux;
|
||||
maintainers = [ maintainers.mic92 ];
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue