link to nvidia lib only if nvidia feature

it's proprietary, many distributions won't ship it by default.
And almost all of our systems don't use nvidia

Signed-off-by: Daniel Schaefer <[email protected]>

Author: JohnAZoidberg

framework_lib/Cargo.toml

@@ -18,6 +18,7 @@ readonly = [ ]
 rusb = ["dep:rusb"]
 hidapi = ["dep:hidapi"]
 uefi = [ "lazy_static/spin_no_std" ]
+nvidia = ["dep:nvml-wrapper"]
 
 [build-dependencies]
 built = { version = "0.5", features = ["chrono", "git2"] }
@@ -51,7 +52,7 @@ clap = { version = "4.5", features = ["derive", "cargo"] }
 clap-num = { version = "1.2.0" }
 clap-verbosity-flag = { version = "2.2.1" }
 windows-version = "0.1.4"
-nvml-wrapper = "0.11.0"
+nvml-wrapper = { version = "0.11.0", optional = true }
 
 [target.'cfg(unix)'.dependencies]
 libc = "0.2.155"
@@ -62,7 +63,7 @@ env_logger = "0.11"
 clap = { version = "4.5", features = ["derive", "cargo"] }
 clap-num = { version = "1.2.0" }
 clap-verbosity-flag = { version = "2.2.1" }
-nvml-wrapper = "0.11.0"
+nvml-wrapper = { version = "0.11.0", optional = true }
 
 [target.'cfg(windows)'.dependencies.windows]
 version = "0.59.0"

framework_lib/src/commandline/mod.rs

@@ -69,7 +69,7 @@ use sha2::{Digest, Sha256, Sha384, Sha512};
 //use smbioslib::*;
 use smbioslib::{DefinedStruct, SMBiosInformation};
 
-#[cfg(any(target_os = "linux", target_os = "windows"))]
+#[cfg(feature = "nvidia")]
 use nvml_wrapper::{enum_wrappers::device::TemperatureSensor, Nvml};
 
 use crate::chromium_ec::{CrosEc, CrosEcDriverType, HardwareDeviceType};
@@ -357,8 +357,6 @@ fn print_pd_details(ec: &CrosEc) {
 #[cfg(feature = "hidapi")]
 const NOT_SET: &str = "NOT SET";
 
-const UNKNOWN: &str = "Unknown";
-
 #[cfg(feature = "rusb")]
 fn print_audio_card_details() {
     check_synaptics_fw_version();
@@ -728,11 +726,11 @@ fn print_versions(ec: &CrosEc) {
     #[cfg(feature = "hidapi")]
     print_dp_hdmi_details(false);
 
-    #[cfg(any(target_os = "linux", target_os = "windows"))]
+    #[cfg(feature = "nvidia")]
     print_nvidia_details();
 }
 
-#[cfg(any(target_os = "linux", target_os = "windows"))]
+#[cfg(feature = "nvidia")]
 fn print_nvidia_details() {
     let nvml = match Nvml::init() {
         Ok(nvml) => nvml,
@@ -755,18 +753,18 @@ fn print_nvidia_details() {
     info!("  BRAND:          {:?}", device.brand());
     println!(
         "  Name:             {}",
-        device.name().unwrap_or(UNKNOWN.to_string())
+        device.name().unwrap_or("Unknown".to_string())
     );
     println!("  Architecture:     {:?}", device.architecture());
     println!(
         "  VBIOS Version:    {}",
-        device.vbios_version().unwrap_or(UNKNOWN.to_string())
+        device.vbios_version().unwrap_or("Unknown".to_string())
     );
     println!(
         "  INFO ROM Ver:     {}",
         device
             .info_rom_image_version()
-            .unwrap_or(UNKNOWN.to_string())
+            .unwrap_or("Unknown".to_string())
     );
     println!("  PCI Info:         {:X?}", device.pci_info());
     println!("  Performance State:{:?}", device.performance_state());

framework_tool/Cargo.toml

@@ -15,6 +15,7 @@ path = "src/main.rs"
 [features]
 default = [ ]
 readonly = [ "framework_lib/readonly" ]
+nvidia = [ "framework_lib/nvidia" ]
 
 [dependencies.framework_lib]
 path = "../framework_lib"