diff --git a/nixos/doc/manual/release-notes/rl-2003.xml b/nixos/doc/manual/release-notes/rl-2003.xml
index b13aa1ba3dc..3447b1221bc 100644
--- a/nixos/doc/manual/release-notes/rl-2003.xml
+++ b/nixos/doc/manual/release-notes/rl-2003.xml
@@ -206,6 +206,14 @@
.
+
+
+ The dump1090 derivation has been changed to use FlightAware's dump1090
+ as its upstream. However, this version does not have an internal webserver anymore. The
+ assets in the share/dump1090 directory of the derivation can be used
+ in conjunction with an external webserver to replace this functionality.
+
+
diff --git a/pkgs/applications/radio/dump1090/default.nix b/pkgs/applications/radio/dump1090/default.nix
index 41ddb671a36..0a92bea44e8 100644
--- a/pkgs/applications/radio/dump1090/default.nix
+++ b/pkgs/applications/radio/dump1090/default.nix
@@ -1,21 +1,31 @@
-{ stdenv, fetchFromGitHub, pkgconfig, libusb, rtl-sdr }:
+{ stdenv
+, fetchFromGitHub
+, pkgconfig
+, libbladeRF
+, libusb
+, ncurses
+, rtl-sdr
+}:
stdenv.mkDerivation rec {
pname = "dump1090";
- version = "2014-10-31";
+ version = "3.7.2";
src = fetchFromGitHub {
- owner = "MalcolmRobb";
+ owner = "flightaware";
repo = pname;
- rev = "bff92c4ad772a0a8d433f788d39dae97e00e4dbe";
- sha256 = "06aaj9gpz5v4qzvnp8xf18wdfclp0jvn3hflls79ly46gz2dh9hy";
+ rev = "v${version}";
+ sha256 = "0vlv9bd805kid202xxkrnl51rh02cyrl055gbcqlqgk51j5rrq8w";
};
nativeBuildInputs = [ pkgconfig ];
- buildInputs = [ libusb rtl-sdr ];
-
- makeFlags = [ "PREFIX=$(out)" ];
+ buildInputs = [
+ libbladeRF
+ libusb
+ ncurses
+ rtl-sdr
+ ];
installPhase = ''
mkdir -p $out/bin $out/share
@@ -25,8 +35,8 @@ stdenv.mkDerivation rec {
meta = with stdenv.lib; {
description = "A simple Mode S decoder for RTLSDR devices";
- homepage = https://github.com/MalcolmRobb/dump1090;
- license = licenses.bsd3;
+ homepage = "https://github.com/flightaware/dump1090";
+ license = licenses.gpl2Plus;
platforms = platforms.linux;
maintainers = with maintainers; [ earldouglas ];
};