Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

iwd: split ell to separate derivation, update iwd and ell #60058

Merged
merged 2 commits into from
Apr 23, 2019
Merged

iwd: split ell to separate derivation, update iwd and ell #60058

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ba9c0
iwd: split ell to separate derivation, update iwd and ell
dtzWill Mar 21, 2019
3412b70
iwd: use default readline for simplicity.
dtzWill Apr 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 22 additions & 0 deletions pkgs/os-specific/linux/ell/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 ];
};
}
21 changes: 9 additions & 12 deletions pkgs/os-specific/linux/iwd/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,14 @@
{ stdenv, fetchgit, autoreconfHook, pkgconfig, coreutils, readline, python3Packages }:
{ stdenv, fetchgit, autoreconfHook, pkgconfig, ell, coreutils, readline, 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 = [
Expand All @@ -23,6 +18,7 @@ in stdenv.mkDerivation rec {
];

buildInputs = [
ell
readline
python3Packages.python
];
Expand All @@ -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 .
'';

Expand Down
2 changes: 2 additions & 0 deletions pkgs/top-level/all-packages.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 { };
Expand Down