Unverified Commit 1884b01e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #318310 from bobby285271/fix/libXNVCtrl-license 

xfce.xfce4-sensors-plugin: Fixups for libXNVCtrl meta changes
parents 32eae6e3 cf3f4e54

pkgs/desktops/xfce/panel-plugins/xfce4-sensors-plugin/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
  lm_sensors,

  hddtemp,

  netcat-gnu,

  nvidiaSupport ? true,

  libXNVCtrl,

  nvidiaSupport ? lib.meta.availableOn stdenv.hostPlatform libXNVCtrl,

  gitUpdater,

}:

pkgs/os-specific/linux/nvidia-x11/settings.nix

+5 −2
Original line number Diff line number Diff line
@@ -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";

  };

}