From 9aaf5daa7eab7db99182081e22a9d38482a8fcb4 Mon Sep 17 00:00:00 2001 From: David Guibert Date: Thu, 30 Jun 2022 08:06:38 +0200 Subject: [PATCH] nsight_compute: qt6 for version 2022.2.0 --- .../compilers/cudatoolkit/redist/overrides.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix index 588f2f2a0867..2f0a8c1f0227 100644 --- a/pkgs/development/compilers/cudatoolkit/redist/overrides.nix +++ b/pkgs/development/compilers/cudatoolkit/redist/overrides.nix @@ -37,8 +37,12 @@ in (lib.filterAttrs (attr: _: (prev ? "${attr}")) { ]; nsight_compute = prev.nsight_compute.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ pkgs.qt5.wrapQtAppsHook ]; - buildInputs = oldAttrs.buildInputs ++ [ pkgs.libsForQt5.qt5.qtwebview ]; + nativeBuildInputs = oldAttrs.nativeBuildInputs + ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.wrapQtAppsHook ] + ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.wrapQtAppsHook ]; + buildInputs = oldAttrs.buildInputs + ++ lib.optionals (lib.versionOlder prev.nsight_compute.version "2022.2.0") [ pkgs.qt5.qtwebview ] + ++ lib.optionals (lib.versionAtLeast prev.nsight_compute.version "2022.2.0") [ pkgs.qt6.qtwebview ]; }); nsight_systems = prev.nsight_systems.overrideAttrs (oldAttrs: {