MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 06:45:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #60058 from dtzWill/feature/iwd-ell-split-and-update

Browse source 
iwd: split ell to separate derivation, update iwd and ell
This commit is contained in:
Jörg Thalheim 2019-04-23 10:58:08 +01:00 committed by GitHub
commit 536fe532c2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
pkgs/os-specific/linux/ell/default.nix Normal file
View file

@ -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
pkgs/os-specific/linux/iwd/default.nix
View file

@ -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 = [
@ -23,6 +18,7 @@ in stdenv.mkDerivation rec {
];
buildInputs = [
ell
readline
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 .
'';

2
pkgs/top-level/all-packages.nix
View file

@ -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 { };