From 20ba9c03ed5b7604953ff737d9aef6be0b592067 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Thu, 21 Mar 2019 10:53:06 -0500
Subject: [PATCH 1/2] iwd: split ell to separate derivation, update iwd and ell

---
 pkgs/os-specific/linux/ell/default.nix | 22 ++++++++++++++++++++++
 pkgs/os-specific/linux/iwd/default.nix | 23 ++++++++++-------------
 pkgs/top-level/all-packages.nix        |  2 ++
 3 files changed, 34 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/os-specific/linux/ell/default.nix

diff --git a/pkgs/os-specific/linux/ell/default.nix b/pkgs/os-specific/linux/ell/default.nix
new file mode 100644
index 00000000000..26c39fdbe6c
--- /dev/null
+++ b/pkgs/os-specific/linux/ell/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchgit, autoreconfHook, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  pname = "ell";
+  version = "0.19";
+
+  src = fetchgit {
+     url = https://git.kernel.org/pub/scm/libs/ell/ell.git;
+     rev = version;
+     sha256 = "0qvgn5yxffgmlggixf6kh57gxricf57iyc8mqwn46j615bijvjs8";
+  };
+
+  nativeBuildInputs = [ autoreconfHook pkgconfig ];
+
+  meta = with stdenv.lib; {
+    homepage = https://git.kernel.org/pub/scm/libs/ell/ell.git;
+    description = "Embedded Linux Library";
+    license = licenses.lgpl21;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ mic92 dtzWill ];
+  };
+}
diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index fc7eda0af88..eb22a08cbc6 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 .
   '';
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 67265932e4a..c49b00c4195 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1420,6 +1420,8 @@ in
 
   elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { };
 
+  ell = callPackage ../os-specific/linux/ell { };
+
   elm-github-install = callPackage ../tools/package-management/elm-github-install { };
 
   emby = callPackage ../servers/emby { };

From 3412b701e5aba88f754fb3a8eac35afdf26458b9 Mon Sep 17 00:00:00 2001
From: Will Dietz <w@wdtz.org>
Date: Mon, 22 Apr 2019 23:21:00 -0500
Subject: [PATCH 2/2] iwd: use default readline for simplicity.

Maybe we'll update it one day :).
---
 pkgs/os-specific/linux/iwd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix
index eb22a08cbc6..1f8f8c90272 100644
--- a/pkgs/os-specific/linux/iwd/default.nix
+++ b/pkgs/os-specific/linux/iwd/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline80, python3Packages }:
+{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, python3Packages }:
 
 stdenv.mkDerivation rec {
   pname = "iwd";
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     ell
-    readline80
+    readline
     python3Packages.python
   ];