Skip to content

Fix build failure when default features disabled #1615

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jacobmichels wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Fix build failure when default features disabled #1615

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
39b3881
check for cli feature before using clap
jacobmichels Jul 19, 2025
28845f6
Merge branch 'main' into main
jacobmichels Jul 21, 2025
10f3acf
remove unnecessary all()
jacobmichels Aug 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/planner/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,16 +158,16 @@ dyn_clone::clone_trait_object!(Planner);
#[derive(Debug, Clone, serde::Serialize, serde::Deserialize)]
#[cfg_attr(feature = "cli", derive(clap::Subcommand))]
pub enum BuiltinPlanner {
#[cfg_attr(not(target_os = "linux"), clap(hide = true))]
#[cfg_attr(all(feature = "cli", not(target_os = "linux")), clap(hide = true))]
/// A planner for traditional, mutable Linux systems like Debian, RHEL, or Arch
Linux(linux::Linux),
#[cfg_attr(not(target_os = "linux"), clap(hide = true))]
#[cfg_attr(all(feature = "cli", not(target_os = "linux")), clap(hide = true))]
/// A planner for the Valve Steam Deck running SteamOS
SteamDeck(steam_deck::SteamDeck),
#[cfg_attr(not(target_os = "linux"), clap(hide = true))]
#[cfg_attr(all(feature = "cli", not(target_os = "linux")), clap(hide = true))]
/// A planner suitable for immutable systems using ostree, such as Fedora Silverblue
Ostree(ostree::Ostree),
#[cfg_attr(not(target_os = "macos"), clap(hide = true))]
#[cfg_attr(all(feature = "cli", not(target_os = "macos")), clap(hide = true))]
/// A planner for MacOS (Darwin) systems
Macos(macos::Macos),
}
Expand Down
4 changes: 2 additions & 2 deletions src/settings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,9 @@ pub struct CommonSettings {
)]
pub nix_package_url: Option<UrlOrPath>,

#[clap(from_global)]
#[cfg_attr(all(feature = "cli"), clap(from_global))]
pub proxy: Option<Url>,
#[clap(from_global)]
#[cfg_attr(all(feature = "cli"), clap(from_global))]
Comment thread
jacobmichels marked this conversation as resolved.
Outdated
pub ssl_cert_file: Option<PathBuf>,

/// Extra configuration lines for `/etc/nix.conf`
Expand Down