Merge pull request #262074 from adamcstephens/nqptp/1.2.4

, fetchFromGitHub

, autoreconfHook

, pkg-config

, gitUpdater

}:

stdenv.mkDerivation rec {

  version = "1.2.3";

  version = "1.2.4";

  pname = "nqptp";

  src = fetchFromGitHub {

    owner = "mikebrady";

    repo = pname;

    rev = "refs/tags/${version}";

    hash = "sha256-Ppsz3hDG6sEf6LJ2WdbTdJ8Gi53f0YmvaUU8TOfVMz4=";

    hash = "sha256-roTNcr3v2kzE6vQ5plAVtlw1+2yJplltOYsGGibtoZo=";

  };

  patches = [

    # this patch should be removed when > 1.2.4

    ./remove-setcap.patch

  ];

  nativeBuildInputs = [ autoreconfHook pkg-config ];

  meta = with lib; {

  passthru.updateScript = gitUpdater {

    ignoredVersions = ".*(-dev|d0)";

  };

  meta = {

    homepage = "https://github.com/mikebrady/nqptp";

    description = "Daemon and companion application to Shairport Sync that monitors timing data from any PTP clocks";

    license = licenses.gpl2Only;

    maintainers = with maintainers; [ jordanisaacs ];

    platforms = platforms.linux ++ platforms.freebsd;

    license = lib.licenses.gpl2Only;

    maintainers = with lib.maintainers; [ jordanisaacs adamcstephens ];

    platforms = lib.platforms.linux ++ lib.platforms.freebsd;

  };

}

diff --git a/Makefile.am b/Makefile.am

index 78f36d7..8dc4e4f 100644

--- a/Makefile.am

+++ b/Makefile.am

@@ -19,8 +19,6 @@ endif

 install-exec-hook:

 if BUILD_FOR_LINUX

-# NQPTP runs as user/group nqptp/nqptp on Linux and uses setcap to access ports 319 and 320

-	setcap 'cap_net_bind_service=+ep' $(bindir)/nqptp

 # no installer for System V

 if INSTALL_SYSTEMD_STARTUP

 	getent group nqptp &>/dev/null || groupadd -r nqptp &>/dev/null