From 902105abb9abbcc363a992e017d36d90ccc37d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 17 Dec 2017 10:41:06 -0200 Subject: [PATCH] iwd-unstable: 2017-09-22 -> 2017-12-14 - Update to the latest commit - Package distributed tools and docs - Add license --- pkgs/os-specific/linux/iwd/default.nix | 42 +++++++++++++++++++++----- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/pkgs/os-specific/linux/iwd/default.nix b/pkgs/os-specific/linux/iwd/default.nix index 52c980494136..f4f870f16c3b 100644 --- a/pkgs/os-specific/linux/iwd/default.nix +++ b/pkgs/os-specific/linux/iwd/default.nix @@ -1,35 +1,61 @@ -{ stdenv, fetchgit, autoreconfHook, readline }: +{ stdenv, fetchgit, autoreconfHook, readline, python3Packages }: let ell = fetchgit { url = https://git.kernel.org/pub/scm/libs/ell/ell.git; - rev = "e0dbdfbd5992bd3e78029b83930b9020e74cdaa5"; - sha256 = "031m1vvcrhggnyvvqyrqpzldi2amsbvhdfcxrypzqz58vysk69vm"; + rev = "8192131685be0f27d6f51b14b78ef93fa7f3c692"; + sha256 = "1k74qz3w0l4zq8llrxc4p62xy0c0n33f260vy3d14wx5rhvf0544"; }; in stdenv.mkDerivation rec { - name = "iwd-unstable-2017-09-22"; + name = "iwd-unstable-2017-12-14"; src = fetchgit { url = https://git.kernel.org/pub/scm/network/wireless/iwd.git; - rev = "31631e1935337910c7bc0c3eb215f579143c1fe0"; - sha256 = "0xl8ali5hy7ragdc4palm857y0prcg32294hv3vv28r9r4x4llcm"; + rev = "cf3372235c4592ca7366b27548abc4e89a982414"; + sha256 = "0dg28j919w1v8sqr6jdj12c233rsjzd2jzkcpag1hx2h3g35hnlz"; }; + nativeBuildInputs = [ + autoreconfHook + python3Packages.wrapPython + ]; + + buildInputs = [ + readline + python3Packages.python + ]; + + pythonPath = [ + python3Packages.dbus-python + python3Packages.pygobject3 + ]; + + enableParallelBuilding = true; + configureFlags = [ "--with-dbusconfdir=$(out)/etc/" ]; postUnpack = '' ln -s ${ell} ell + patchShebangs . ''; - nativeBuildInputs = [ autoreconfHook ]; + postInstall = '' + cp -a test/* $out/bin/ + mkdir -p $out/share + cp -a doc $out/share/ + cp -a README AUTHORS TODO $out/share/doc/ + ''; - buildInputs = [ readline ]; + preFixup = '' + wrapPythonPrograms + ''; meta = with stdenv.lib; { homepage = https://git.kernel.org/pub/scm/network/wireless/iwd.git; description = "Wireless daemon for Linux"; + license = licenses.lgpl21; platforms = platforms.linux; maintainers = [ maintainers.mic92 ]; };