Merge pull request #224986 from SomeoneSerge/cudatoolkit-autopatchelf-followup

cudaPackages_12.cudatoolkit: hotfix after switching to autoPatchelfHook

authored by Samuel Ainsworth and committed by GitHub 1a14c8d6 98140dd0

+27 -5
+27 -5
pkgs/development/compilers/cudatoolkit/common.nix
··· 37 , freeglut 38 , libGLU 39 , libsForQt5 40 }: 41 42 backendStdenv.mkDerivation rec { ··· 67 nativeBuildInputs = [ 68 perl 69 makeWrapper 70 addOpenGLRunpath 71 autoPatchelfHook 72 autoAddOpenGLRunpathHook 73 ] ++ lib.optionals (lib.versionOlder version "11") [ 74 libsForQt5.wrapQtAppsHook 75 ]; 76 - buildInputs = [ 77 # To get $GDK_PIXBUF_MODULE_FILE via setup-hook 78 gdk-pixbuf 79 ··· 109 unixODBC 110 alsa-lib 111 wayland 112 - ] ++ lib.optionals (lib.versionOlder version "11") [ 113 - libsForQt5.qt5.qtwebengine 114 - freeglut 115 - libGLU 116 ]; 117 118 # Prepended to runpaths by autoPatchelf. ··· 204 205 mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 206 mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 207 ''} 208 209 rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?
··· 37 , freeglut 38 , libGLU 39 , libsForQt5 40 + , libtiff 41 + , qt6Packages 42 + , rdma-core 43 + , ucx 44 + , rsync 45 }: 46 47 backendStdenv.mkDerivation rec { ··· 72 nativeBuildInputs = [ 73 perl 74 makeWrapper 75 + rsync 76 addOpenGLRunpath 77 autoPatchelfHook 78 autoAddOpenGLRunpathHook 79 ] ++ lib.optionals (lib.versionOlder version "11") [ 80 libsForQt5.wrapQtAppsHook 81 + ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ 82 + qt6Packages.wrapQtAppsHook 83 ]; 84 + buildInputs = lib.optionals (lib.versionOlder version "11") [ 85 + libsForQt5.qt5.qtwebengine 86 + freeglut 87 + libGLU 88 + ] ++ [ 89 # To get $GDK_PIXBUF_MODULE_FILE via setup-hook 90 gdk-pixbuf 91 ··· 121 unixODBC 122 alsa-lib 123 wayland 124 + ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ 125 + (lib.getLib libtiff) 126 + qt6Packages.qtwayland 127 + rdma-core 128 + ucx 129 + xorg.libxshmfence 130 + xorg.libxkbfile 131 ]; 132 133 # Prepended to runpaths by autoPatchelf. ··· 219 220 mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 221 mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 222 + ''} 223 + ${lib.optionalString (lib.versionAtLeast version "11.8") 224 + # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/.......-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so 225 + # we only ship libtiff.so.6, so let's use qt plugins built by Nix. 226 + # TODO: don't copy, come up with a symlink-based "merge" 227 + '' 228 + rsync ${lib.getLib qt6Packages.qtimageformats}/lib/qt-6/plugins/ $out/host-linux-x64/Plugins/ -aP 229 ''} 230 231 rm -f $out/tools/CUDA_Occupancy_Calculator.xls # FIXME: why?