diff options
author | Jan Tojnar <jtojnar@gmail.com> | 2021-11-22 15:14:24 +0100 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2021-11-22 15:39:38 +0100 |
commit | 32c2b49a404b4b6ec2c6aa0c6b1a45c5bb00c1f6 (patch) | |
tree | 0d2bcf45b5a2aaa3b6b4237e0584494a215c19d6 /pkgs/servers/neard/default.nix | |
parent | d63f471907601cace04c676a0cda68f541f5e040 (diff) |
neard: 0.16 → 0.18
https://git.kernel.org/pub/scm/network/nfc/neard.git/log/?h=v0.18 - Requires autoconf-archive - The systemd service is now installed automatically. On the packging side also - cleaned up formatting - split out dev output - enabled parallel building - corrected license - added myself as maintainer
Diffstat (limited to 'pkgs/servers/neard/default.nix')
-rw-r--r-- | pkgs/servers/neard/default.nix | 61 |
1 files changed, 49 insertions, 12 deletions
diff --git a/pkgs/servers/neard/default.nix b/pkgs/servers/neard/default.nix index 77c6f8839f71d..d41603873e9f7 100644 --- a/pkgs/servers/neard/default.nix +++ b/pkgs/servers/neard/default.nix @@ -1,26 +1,63 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, systemd, glib, dbus, libnl, python2Packages }: +{ stdenv +, lib +, fetchurl +, autoreconfHook +, autoconf-archive +, pkg-config +, systemd +, glib +, dbus +, libnl +, python2Packages +}: stdenv.mkDerivation rec { pname = "neard"; - version = "0.16"; + version = "0.18"; + + outputs = [ "out" "dev" ]; src = fetchurl { url = "https://git.kernel.org/pub/scm/network/nfc/neard.git/snapshot/neard-${version}.tar.gz"; - sha256 = "0bpdmyxvd3z54p95apz4bjb5jp8hbc04sicjapcryjwa8mh6pbil"; + sha256 = "wBPjEVMV4uEdFrXw8cjOmvvNuiaACq2RJF/ZtKXck4s="; }; - nativeBuildInputs = [ autoreconfHook pkg-config python2Packages.wrapPython ]; - buildInputs = [ systemd glib dbus libnl ] ++ (with python2Packages; [ python ]); - pythonPath = with python2Packages; [ pygobject2 dbus-python pygtk ]; + nativeBuildInputs = [ + autoreconfHook + autoconf-archive + pkg-config + python2Packages.wrapPython + ]; + + buildInputs = [ + systemd + glib + dbus + libnl + ] ++ (with python2Packages; [ + python + ]); + + pythonPath = with python2Packages; [ + pygobject2 + dbus-python + pygtk + ]; strictDeps = true; - configureFlags = [ "--disable-debug" "--enable-tools" "--enable-ese" "--with-systemdsystemunitdir=$out/lib/systemd/system" ]; + enableParallelBuilding = true; + + configureFlags = [ + "--disable-debug" + "--enable-tools" + "--enable-ese" + "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" + ]; postInstall = '' install -m 0755 tools/snep-send $out/bin/ - install -D -m644 src/neard.service $out/lib/systemd/system/neard.service install -D -m644 src/main.conf $out/etc/neard/main.conf # INFO: the config option "--enable-test" would copy the apps to $out/lib/neard/test/ instead @@ -31,9 +68,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Near Field Communication manager"; - homepage = "https://01.org/linux-nfc"; - license = licenses.gpl2; - maintainers = with maintainers; [ tstrobel ]; - platforms = platforms.unix; + homepage = "https://01.org/linux-nfc"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ jtojnar tstrobel ]; + platforms = platforms.unix; }; } |