diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-07 12:01:27 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-06-07 12:01:27 +0000 |
commit | ecc75d299d08de8552a1f4e3e8cc3e5c8764adbe (patch) | |
tree | da28882a583da38c61c522832a729ea4f646b549 /pkgs/os-specific/linux | |
parent | 5aa86ae5585cd46299ee46682fda8a9b76baf2ae (diff) | |
parent | dfec583872cf7ae087a5ff8659e6480798f16ba9 (diff) |
Merge master into staging-next
Diffstat (limited to 'pkgs/os-specific/linux')
-rw-r--r-- | pkgs/os-specific/linux/nvidia-x11/settings.nix | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/pkgs/os-specific/linux/nvidia-x11/settings.nix b/pkgs/os-specific/linux/nvidia-x11/settings.nix index e13f3a157b641..6db6644d88fe7 100644 --- a/pkgs/os-specific/linux/nvidia-x11/settings.nix +++ b/pkgs/os-specific/linux/nvidia-x11/settings.nix @@ -30,6 +30,14 @@ let inherit sha256; }; + 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 ]; + }; + libXNVCtrl = stdenv.mkDerivation { pname = "libXNVCtrl"; version = nvidia_x11.settingsVersion; @@ -62,6 +70,10 @@ let cp NVCtrlLib.h $out/include/NVCtrl cp -P libXNVCtrl.so* $out/lib ''; + + meta = meta // { + description = "NVIDIA NV-CONTROL X extension"; + }; }; in @@ -102,21 +114,20 @@ stdenv.mkDerivation { fi ''; - nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ]; + nativeBuildInputs = [ pkg-config m4 addOpenGLRunpath ] + ++ lib.optionals withGtk3 [ wrapGAppsHook3 ]; - buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 gtk2 dbus ] - ++ lib.optionals withGtk3 [ gtk3 librsvg wrapGAppsHook3 ]; + buildInputs = [ jansson libXv libXrandr libXext libXxf86vm libvdpau nvidia_x11 dbus ] + ++ lib.optionals (withGtk2 || lib.versionOlder nvidia_x11.settingsVersion "525.53") [ gtk2 ] + ++ lib.optionals withGtk3 [ gtk3 librsvg ]; installFlags = [ "PREFIX=$(out)" ]; - postInstall = '' - ${lib.optionalString (!withGtk2) '' - rm -f $out/lib/libnvidia-gtk2.so.* - ''} - ${lib.optionalString (!withGtk3) '' - rm -f $out/lib/libnvidia-gtk3.so.* - ''} - + postInstall = lib.optionalString (!withGtk2) '' + rm -f $out/lib/libnvidia-gtk2.so.* + '' + lib.optionalString (!withGtk3) '' + rm -f $out/lib/libnvidia-gtk3.so.* + '' + '' # Install the desktop file and icon. # The template has substitution variables intended to be replaced resulting # in absolute paths. Because absolute paths break after the desktop file is @@ -141,12 +152,7 @@ stdenv.mkDerivation { inherit libXNVCtrl; }; - meta = with lib; { - homepage = "https://www.nvidia.com/object/unix.html"; + meta = meta // { description = "Settings application for NVIDIA graphics cards"; - license = licenses.unfreeRedistributable; - platforms = nvidia_x11.meta.platforms; - mainProgram = "nvidia-settings"; - maintainers = with maintainers; [ abbradar aidalgol ]; }; } |