diff --git a/hosts/radiobert/readsb.nix b/hosts/radiobert/readsb.nix index bcd1922d..60aa62db 100644 --- a/hosts/radiobert/readsb.nix +++ b/hosts/radiobert/readsb.nix @@ -21,7 +21,7 @@ in { systemd.services.readsb = { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.readsb}/bin/readsb --device-type rtlsdr --modeac --aggressive --fix --stats-range --dcfilter --quiet --gain=-10 --lon=${lon} --lat=${lat} --write-json=${statsDir} --net --net-ro-port=30002 --net-sbs-port=30003 --net-bo-port=30005 --net-vrs-port=30006 --net-beast-reduce-interval 1 --net-connector feed.adsbexchange.com,30005,beast_reduce_out --uuid-file=${builtins.toFile "uuid" "68a0e3e1-c866-481c-b0cb-f12ff9e7465f"}"; + ExecStart = "${pkgs.readsb}/bin/readsb --modeac --aggressive --fix --stats-range --dcfilter --quiet --gain=-10 --lon=${lon} --lat=${lat} --write-output=${statsDir} --net --net-ro-port=30002 --net-sbs-port=30003 --net-bo-port=30005 --net-vrs-port=30006 --net-beast-reduce-interval 1 --net-connector feed.adsbexchange.com,30005,beast_reduce_out"; User = "readsb"; Group = "adsb"; ProtectSystem = "full"; diff --git a/overlay/readsb.nix b/overlay/readsb.nix index 3ea6abf1..6c8b9973 100644 --- a/overlay/readsb.nix +++ b/overlay/readsb.nix @@ -1,28 +1,32 @@ { stdenv, fetchFromGitHub , pkg-config, protobufc -, ncurses, libusb1, zlib -, librtlsdr +, ncurses, rrdtool, libusb1 +, libbladeRF, librtlsdr +# , libad9361, libiio }: stdenv.mkDerivation rec { - name = "readsb"; + name = "readsb-protobuf"; src = fetchFromGitHub { - owner = "wiedehopf"; + owner = "Mictronics"; repo = name; rev = "dev"; - sha256 = "19y3mf8s6zrkj4ar6wnlaxw7cy3cj46h9r0mcr30d5f0i48y24j8"; + sha256 = "03hq9bjg9p6wysys7p0l3hzlfwzbp74k50yjd2n9lg3v1yc4vccl"; }; nativeBuildInputs = [ - pkg-config + pkg-config protobufc ]; buildInputs = [ - ncurses zlib libusb1 - librtlsdr + ncurses rrdtool libusb1 + libbladeRF librtlsdr + # libad9361 libiio ]; - enableParallelBuilding = true; + # enableParallelBuilding = true; makeFlags = [ + "BLADERF=yes" "RTLSDR=yes" + # "PLUTOSDR=yes" ]; installPhase = ''