diff options
author | Will Dietz <w@wdtz.org> | 2019-03-21 10:53:06 -0500 |
---|---|---|
committer | Will Dietz <w@wdtz.org> | 2019-04-22 15:55:15 -0500 |
commit | 20ba9c03ed5b7604953ff737d9aef6be0b592067 (patch) | |
tree | b71a6c3e3c2e324f7dd8949ec30253f9e4a03251 /pkgs/os-specific/linux/iwd | |
parent | 40d2f43fe5db04a40919f84dab7888503a2446df (diff) |
iwd: split ell to separate derivation, update iwd and ell
Diffstat (limited to 'pkgs/os-specific/linux/iwd')
-rw-r--r-- | pkgs/os-specific/linux/iwd/default.nix | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index fc7eda0af88c2..eb22a08cbc604 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,19 +1,14 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, coreutils, readline, python3Packages }: +{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline80, python3Packages }: -let - ell = fetchgit { - url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "0.17"; - sha256 = "0yk1qmvpy61qp82bb0w55n062jqzlkzbz0b1v5k763j98czz9rvz"; - }; -in stdenv.mkDerivation rec { - name = "iwd-${version}"; - version = "0.14"; +stdenv.mkDerivation rec { + pname = "iwd"; + + version = "0.17"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; rev = version; - sha256 = "08ijlnwvj1w354gbv3hdnm3l4iy24qzq4bq5a9z0wynysasw09lv"; + sha256 = "1bqkzl03qvzfq5hqd9nsfc98k0iyz864nzcrnbf3fr0n9wnzqffz"; }; nativeBuildInputs = [ @@ -23,7 +18,8 @@ in stdenv.mkDerivation rec { ]; buildInputs = [ - readline + ell + readline80 python3Packages.python ]; @@ -36,12 +32,13 @@ in stdenv.mkDerivation rec { "--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" ]; postUnpack = '' - ln -s ${ell} ell patchShebangs . ''; |