Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cudaPackages_12_2.cudatoolkit: init at 12.2.0 #240457

Merged
merged 1 commit into from
Jul 4, 2023
Merged

cudaPackages_12_2.cudatoolkit: init at 12.2.0 #240457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 16 additions & 10 deletions pkgs/development/compilers/cudatoolkit/common.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ args@
, libsForQt5
, libtiff
, qt6Packages
, qt6
, rdma-core
, ucx
, rsync
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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*"}
Expand Down
1 change: 1 addition & 0 deletions pkgs/development/compilers/cudatoolkit/redist/extension.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading