about summary refs log tree commit diff
path: root/pkgs/os-specific
diff options
context:
space:
mode:
authorBobby Rong <rjl931189261@126.com>2024-06-08 23:42:26 +0800
committerBobby Rong <rjl931189261@126.com>2024-06-08 23:43:22 +0800
commit1d68a6ff89dbdb0e5e6b1cd98b148122cf861bd1 (patch)
tree45d62cda3a7ec5167f96c25bd53347be1caca6a9 /pkgs/os-specific
parented5f4b938fa96aa6ad20fff3b04bd96bf5abb3f9 (diff)
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.
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r--pkgs/os-specific/linux/nvidia-x11/settings.nix7
1 files 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 6db6644d88fe7..a26acd144125c 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";
   };
 }