Merge pull request #240457 from Dessix/dev/dessix/update-cudatoolkit-…

…12.2 cudaPackages_12_2.cudatoolkit: init at 12.2.0
NixOS · Jul 4, 2023 · 1bbdebb · 1bbdebb
2 parents f6dc216 + 532a7d3
commit 1bbdebb
Show file tree

Hide file tree

Showing 5 changed files with 1,175 additions and 10 deletions.
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix
@@ -42,6 +42,7 @@ args@
 , libsForQt5
 , libtiff
 , qt6Packages
+, qt6
 , rdma-core
 , ucx
 , rsync
@@ -131,22 +132,23 @@ backendStdenv.mkDerivation rec {
     ucx
     xorg.libxshmfence
     xorg.libxkbfile
-  ] ++ lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib [
+  ] ++ (lib.optionals (lib.versionAtLeast version "12.1") (map lib.getLib ([
     # Used by `/target-linux-x64/CollectX/clx` and `/target-linux-x64/CollectX/libclx_api.so` for:
     # - `libcurl.so.4`
     curlMinimal
 
-    # Used by `/target-linux-x64/libQt6Multimedia.so.6` for:
-    # - `libgstaudio-1.0.so.0`
-    # - `libgstvideo-1.0.so.0`
-    # - `libgstpbutils-1.0.so.0`
-    # - `libgstallocators-1.0.so.0`
-    # - `libgstapp-1.0.so.0`
-    # - `libgstbase-1.0.so.0`
-    # - `libgstreamer-1.0.so.0`
+    # Used by `/host-linux-x64/Scripts/WebRTCContainer/setup/neko/server/bin/neko`
     gst_all_1.gstreamer
     gst_all_1.gst-plugins-base
-  ]);
+  ]) ++ (with qt6; [
+    qtmultimedia
+    qttools
+    qtpositioning
+    qtscxml
+    qtsvg
+    qtwebchannel
+    qtwebengine
+  ])));
 
   # Prepended to runpaths by autoPatchelf.
   # The order inherited from older rpath preFixup code
@@ -258,6 +260,10 @@ backendStdenv.mkDerivation rec {
     rm -rf $out/lib
     ''}
 
+    ${lib.optionalString (lib.versionAtLeast version "12.0") ''
+    rm $out/host-linux-x64/libQt6*
+    ''}
+
     # Remove some cruft.
     ${lib.optionalString ((lib.versionAtLeast version "7.0") && (lib.versionOlder version "10.1"))
       "rm $out/bin/uninstall*"}

diff --git a/pkgs/development/compilers/cudatoolkit/redist/extension.nix b/pkgs/development/compilers/cudatoolkit/redist/extension.nix
@@ -15,6 +15,7 @@ final: prev: let
     "11.8" = ./manifests/redistrib_11.8.0.json;
     "12.0" = ./manifests/redistrib_12.0.1.json;
     "12.1" = ./manifests/redistrib_12.1.1.json;
+    "12.2" = ./manifests/redistrib_12.2.0.json;
   };
 
   # Function to build a single cudatoolkit redist package