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

Merge pull request #51439 from jfrankenau/update-iwd

Browse Source 
iwd: 0.11 -> 0.12
This commit is contained in:
Vladyslav M 2018-12-04 02:24:35 +02:00 committed by GitHub
commit 19532f2ba2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3,17 +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 = "0.14"; rev = "0.15";
sha256 = "13jlmdk47pscmfs3c12awfwr3m6ka4fh6fyr9cl1bmqdpwqmmmk6"; sha256 = "1jwk5gxcs964ddca9asw6fvc4h9q8d2x1y3linfi11b5vf30bghn";
}; };
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "iwd-${version}"; name = "iwd-${version}";
version = "0.11"; version = "0.12";
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 = version; rev = version;
sha256 = "0q79rdj3h16xdf0g2jdsvb2141z36z89vgzq0qn31pxzhgxdgf7j"; sha256 = "156zq3zqa2vfmvy3yv9lng23mhrhlgwh0p2x3fcn10nkks9q89pn";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -40,6 +40,7 @@ in stdenv.mkDerivation rec {
"--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/" "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/"
"--with-systemd-unitdir=$(out)/lib/systemd/system/" "--with-systemd-unitdir=$(out)/lib/systemd/system/"
"--localstatedir=/var/" "--localstatedir=/var/"
"--enable-wired"
]; ];
postUnpack = '' postUnpack = ''
@ -59,6 +60,8 @@ in stdenv.mkDerivation rec {
''; '';
postFixup = '' postFixup = ''
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.ead.service \
--replace /bin/false ${coreutils}/bin/false
substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \ substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \
--replace /bin/false ${coreutils}/bin/false --replace /bin/false ${coreutils}/bin/false
''; '';