iwd: 0.4 -> 0.7

+14 -15
+1 -8
nixos/modules/services/networking/iwd.nix
··· 20 21 services.dbus.packages = [ pkgs.iwd ]; 22 23 - systemd.services.iwd = { 24 - description = "Wireless daemon"; 25 - before = [ "network.target" ]; 26 - wants = [ "network.target" ]; 27 - wantedBy = [ "multi-user.target" ]; 28 - 29 - serviceConfig.ExecStart = "${pkgs.iwd}/libexec/iwd"; 30 - }; 31 32 systemd.tmpfiles.rules = [ 33 "d /var/lib/iwd 0700 root root -"
··· 20 21 services.dbus.packages = [ pkgs.iwd ]; 22 23 + systemd.packages = [ pkgs.iwd ]; 24 25 systemd.tmpfiles.rules = [ 26 "d /var/lib/iwd 0700 root root -"
+13 -7
pkgs/os-specific/linux/iwd/default.nix
··· 1 - { stdenv, fetchgit, autoreconfHook, readline, python3Packages }: 2 3 let 4 ell = fetchgit { 5 url = https://git.kernel.org/pub/scm/libs/ell/ell.git; 6 - rev = "0.7"; 7 - sha256 = "095psnpfdy107z5qgi5zw0icqxa44dfx02lza3pd8j4ybj57n0l7"; 8 }; 9 in stdenv.mkDerivation rec { 10 name = "iwd-${version}"; 11 - version = "0.4"; 12 13 src = fetchgit { 14 url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; 15 rev = version; 16 - sha256 = "1hib256jm70k6jlx486jrcv0iip52divbzhvb0f455yh28qfk0hs"; 17 }; 18 19 nativeBuildInputs = [ ··· 35 36 configureFlags = [ 37 "--with-dbus-datadir=$(out)/etc/" 38 - "--localstatedir=/var" 39 - "--disable-systemd-service" 40 ]; 41 42 postUnpack = '' ··· 53 54 preFixup = '' 55 wrapPythonPrograms 56 ''; 57 58 meta = with stdenv.lib; {
··· 1 + { stdenv, fetchgit, autoreconfHook, coreutils, readline, python3Packages }: 2 3 let 4 ell = fetchgit { 5 url = https://git.kernel.org/pub/scm/libs/ell/ell.git; 6 + rev = "0.9"; 7 + sha256 = "1kg7cx7ir8bvz33n624ncrq9r4fh7rg9z22fly894a3mk1imq22p"; 8 }; 9 in stdenv.mkDerivation rec { 10 name = "iwd-${version}"; 11 + version = "0.7"; 12 13 src = fetchgit { 14 url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; 15 rev = version; 16 + sha256 = "0q76fh6fcl7nxyjl8z2n4plp2qaxc1fqx575by6xqf1rnv4nk0ab"; 17 }; 18 19 nativeBuildInputs = [ ··· 35 36 configureFlags = [ 37 "--with-dbus-datadir=$(out)/etc/" 38 + "--with-dbus-busdir=$(out)/usr/share/dbus-1/system-services/" 39 + "--with-systemd-unitdir=$(out)/lib/systemd/system/" 40 + "--localstatedir=/var/" 41 ]; 42 43 postUnpack = '' ··· 54 55 preFixup = '' 56 wrapPythonPrograms 57 + ''; 58 + 59 + postFixup = '' 60 + substituteInPlace $out/usr/share/dbus-1/system-services/net.connman.iwd.service \ 61 + --replace /bin/false ${coreutils}/bin/false 62 ''; 63 64 meta = with stdenv.lib; {