diff options
| author | Sandro <sandro.jaeckel@gmail.com> | 2024-06-08 21:55:59 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-08 21:55:59 +0200 |
| commit | 1884b01eeac55fe14ab717ace2b2df9232e46564 (patch) | |
| tree | 904d03844385d304f1523fc19adf5c6dbf61a341 | |
| parent | 32eae6e37f66869b695481bc591f2caae803bd18 (diff) | |
| parent | cf3f4e54a085506e2a0aa26da7c3de2d6eac69d8 (diff) | |
Merge pull request #318310 from bobby285271/fix/libXNVCtrl-license
xfce.xfce4-sensors-plugin: Fixups for libXNVCtrl meta changes
| -rw-r--r-- | pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 7 |
2 files changed, 6 insertions, 3 deletions
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 07445ffb1c992..43896afa4f15f 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, }: 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"; }; } |