From 1d68a6ff89dbdb0e5e6b1cd98b148122cf861bd1 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 8 Jun 2024 23:42:26 +0800
Subject: [PATCH 1/2] nvidia-x11: Fix libXNVCtrl license

Assuming neither libXNVCtrl nor its dependencies are nonfree
we can have this built on Hydra.

Also libXNVCtrl does not provide the mainProgram.
---
 pkgs/os-specific/linux/nvidia-x11/settings.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix
index 6db6644d88fe..a26acd144125 100644
--- a/pkgs/os-specific/linux/nvidia-x11/settings.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix
@@ -32,9 +32,7 @@ let
 
   meta = with lib; {
     homepage = "https://www.nvidia.com/object/unix.html";
-    license = licenses.unfreeRedistributable;
     platforms = nvidia_x11.meta.platforms;
-    mainProgram = "nvidia-settings";
     maintainers = with maintainers; [ abbradar aidalgol ];
   };
 
@@ -73,6 +71,8 @@ let
 
     meta = meta // {
       description = "NVIDIA NV-CONTROL X extension";
+      # https://github.com/NVIDIA/nvidia-settings/commit/edcf9edad9f52f9b10e63d4480bbe88b22dde884
+      license = lib.licenses.mit;
     };
   };
 
@@ -154,5 +154,8 @@ stdenv.mkDerivation {
 
   meta = meta // {
     description = "Settings application for NVIDIA graphics cards";
+    # nvml.h is licensed as part of the cuda developer license.
+    license = lib.licenses.unfreeRedistributable;
+    mainProgram = "nvidia-settings";
   };
 }

From cf3f4e54a085506e2a0aa26da7c3de2d6eac69d8 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 9 Jun 2024 00:06:16 +0800
Subject: [PATCH 2/2] xfce.xfce4-sensors-plugin: Only build nvidiaSupport when
 libXNVCtrl is available

Only x86_64-linux and aarch64-linux right now.
---
 .../xfce/panel-plugins/xfce4-sensors-plugin/default.nix         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
index 07445ffb1c99..43896afa4f15 100644
--- a/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
+++ b/pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix
@@ -12,8 +12,8 @@
   lm_sensors,
   hddtemp,
   netcat-gnu,
-  nvidiaSupport ? true,
   libXNVCtrl,
+  nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,
   gitUpdater,
 }: