fix compilation errors

Author: xoolive

.github/workflows/rust.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install Linux dependencies
         run: |
           sudo apt update
-          sudo apt-get install -y --no-install-recommends libsoapysdr-dev protobuf-compiler
+          sudo apt-get install -y --no-install-recommends libiio-dev libsoapysdr-dev protobuf-compiler
 
       - name: Code linting
         run: cargo clippy --workspace --all-targets --all-features -- -D warnings
@@ -30,7 +30,7 @@ jobs:
         run: cargo fmt --all --check
 
       - name: Build
-        run: cargo build --verbose --release
+        run: cargo build --verbose --release --all-features
 
       - name: Run tests, examples and benchmarks
         run: cargo test --workspace --all-features --all-targets

crates/jet1090/Cargo.toml

@@ -35,7 +35,7 @@ ratatui = "0.29.0"
 redis = { version = "1.0.1", features = ["tokio-comp"] }
 regex = "1.12.2"
 reqwest = { version = "0.12.26", default-features = false, features = ["rustls-tls"] }
-rs1090 = { version = "0.4.15", path = "../rs1090", features = ["aircraft"] }
+rs1090 = { version = "0.4.15", path = "../rs1090", features = ["aircraft", "sdr"] }
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.143"
 soapysdr = { version = "0.4.4", optional = true }

crates/jet1090/src/source.rs

@@ -310,7 +310,7 @@ impl Source {
             Address::Pluto(config) => {
                 #[cfg(not(feature = "pluto"))]
                 {
-                    error!("Compile jet1090 with the pluto feature, {:?} argument ignored", uri);
+                    error!("Compile jet1090 with the pluto feature, {:?} argument ignored", config);
                     std::process::exit(127);
                 }
                 #[cfg(feature = "pluto")]
@@ -332,7 +332,7 @@ impl Source {
             Address::Soapy(config) => {
                 #[cfg(not(feature = "soapy"))]
                 {
-                    error!("Compile jet1090 with the soapy feature, {:?} argument ignored", args);
+                    error!("Compile jet1090 with the soapy feature, {:?} argument ignored", config);
                     std::process::exit(127);
                 }
                 #[cfg(feature = "soapy")]

crates/rs1090/Cargo.toml

@@ -11,9 +11,10 @@ edition.workspace = true
 
 [features]
 aircraft = ['dirs', 'reqwest', 'rusqlite', 'zip']
-rtlsdr = ['desperado/rtlsdr']
-pluto = ['desperado/pluto']
-soapy = ['desperado/soapy']
+rtlsdr = ['sdr', 'desperado/rtlsdr']
+pluto = ['sdr', 'desperado/pluto']
+soapy = ['sdr', 'desperado/soapy']
+sdr = ['dep:desperado']
 sero = ['prost', 'tonic', 'tonic-prost', 'dirs', 'reqwest']
 ssh = ['async-recursion', 'bytes', 'dirs', 'http', 'hyper-util', 'makiko', 'ssh2-config', 'tower']
 
@@ -22,7 +23,7 @@ ansi_term = "0.12.1"
 async-recursion = { version = "1.1.1", optional = true }
 async-stream = "0.3.6"
 bytes = { version = "1.11.0", optional = true }
-desperado = "0.1.2"
+desperado = { version = "0.1.2", optional = true }
 deku = { version = "0.20.2", features = ["logging"] }
 dirs = { version = "6.0.0", optional = true }
 futures = "0.3.31"

crates/rs1090/src/lib.rs

@@ -31,6 +31,7 @@ pub mod prelude {
     #[cfg(not(target_arch = "wasm32"))]
     pub use crate::source::beast;
 
+    #[cfg(feature = "sdr")]
     pub use crate::source::iqread;
 
     #[cfg(feature = "sero")]

crates/rs1090/src/source/mod.rs

@@ -1,6 +1,7 @@
 #[cfg(not(target_arch = "wasm32"))]
 pub mod beast;
 
+#[cfg(feature = "sdr")]
 pub mod iqread;
 
 #[cfg(feature = "sero")]

dist-workspace.toml

@@ -12,13 +12,20 @@ installers = ["shell", "powershell", "homebrew"]
 # A GitHub repo to push Homebrew formulas to
 tap = "xoolive/homebrew-homebrew"
 # Target platforms to build apps for (Rust target-triple syntax)
-targets = ["aarch64-apple-darwin", "aarch64-unknown-linux-gnu", "x86_64-apple-darwin", "x86_64-unknown-linux-gnu", "x86_64-pc-windows-msvc"]
+targets = [
+    "aarch64-apple-darwin",
+    "aarch64-unknown-linux-gnu",
+    "x86_64-apple-darwin",
+    "x86_64-unknown-linux-gnu",
+    "x86_64-pc-windows-msvc",
+]
 # Which actions to run on pull requests
 pr-run-mode = "plan"
 # Publish jobs to run in CI
 publish-jobs = ["homebrew"]
 # Whether to pass --all-features to cargo build
-all-features = true
+# all-features = true
+features = ["rtlsdr", "sero", "ssh"]
 # Path that installers should place binaries in
 install-path = "CARGO_HOME"
 # Whether to install an updater program
@@ -28,13 +35,13 @@ install-updater = true
 github-build-setup = "../release_setup.yml"
 
 [dist.dependencies.apt]
-libsoapysdr-dev = "*"
+# libsoapysdr-dev = "*"
 # soapysdr-module-rtlsdr = "*"  # only for running
 protobuf-compiler = "*"
 
 [dist.dependencies.homebrew]
-soapysdr = { stage = ["build", "run"] }
-soapyrtlsdr = { stage = ["run"] }
+# soapysdr = { stage = ["build", "run"] }
+# soapyrtlsdr = { stage = ["run"] }
 protobuf = { stage = ["build"] }
 
 [dist.github-custom-runners]

flake.nix

@@ -66,15 +66,15 @@
               openssl
               python3
               bzip2
-              soapysdr
+              # soapysdr
               protobuf
             ] ++ lib.optionals pkgs.stdenv.isLinux [
               lld
               rustPlatform.bindgenHook # issue with stdbool.h on nix flake check
             ];
 
             buildInputs = with pkgs; [
-              soapysdr
+              # soapysdr
             ] ++ lib.optionals pkgs.stdenv.isDarwin [
               libiconv
             ];
@@ -102,7 +102,7 @@
 
             jet1090 = craneLib.buildPackage (commonArgs // {
               pname = "jet1090";
-              cargoExtraFlags = "--all-features -p jet1090";
+              cargoExtraFlags = "--features rtlsdr,ssh,sero -p jet1090";
               meta.mainProgram = "jet1090";
               inherit cargoArtifacts;