diff options
| author | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-04-06 16:38:40 +0300 |
|---|---|---|
| committer | Someone Serge <sergei.kozlukov@aalto.fi> | 2023-04-06 22:30:11 +0300 |
| commit | b100b0a1cc11146a8354ddb8064861afc2c7a659 (patch) | |
| tree | bb297888446e1d563c6bc087bd076b5cc9bcf568 /pkgs/development/compilers/cudatoolkit/common.nix | |
| parent | 221fe82378432da3bfd63c0f73090b2bdeb4200f (diff) | |
| download | nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar.gz nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar.bz2 nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar.lz nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar.xz nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.tar.zst nixpkgs-b100b0a1cc11146a8354ddb8064861afc2c7a659.zip | |
cudaPackages_11_8: un-break after migrating to autoPatchelfHook
Diffstat (limited to 'pkgs/development/compilers/cudatoolkit/common.nix')
| -rw-r--r-- | pkgs/development/compilers/cudatoolkit/common.nix | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/cudatoolkit/common.nix b/pkgs/development/compilers/cudatoolkit/common.nix index 94dd8259c7c..02eda05de80 100644 --- a/pkgs/development/compilers/cudatoolkit/common.nix +++ b/pkgs/development/compilers/cudatoolkit/common.nix @@ -78,7 +78,7 @@ backendStdenv.mkDerivation rec { autoAddOpenGLRunpathHook ] ++ lib.optionals (lib.versionOlder version "11") [ libsForQt5.wrapQtAppsHook - ] ++ lib.optionals (lib.versions.major version == "12") [ + ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ qt6Packages.wrapQtAppsHook ]; buildInputs = lib.optionals (lib.versionOlder version "11") [ @@ -121,7 +121,7 @@ backendStdenv.mkDerivation rec { unixODBC alsa-lib wayland - ] ++ lib.optionals (lib.versions.major version == "12") [ + ] ++ lib.optionals (lib.versionAtLeast version "11.8") [ (lib.getLib libtiff) qt6Packages.qtwayland rdma-core @@ -220,8 +220,8 @@ backendStdenv.mkDerivation rec { mv pkg/builds/nsight_systems/target-linux-x64 $out/target-linux-x64 mv pkg/builds/nsight_systems/host-linux-x64 $out/host-linux-x64 ''} - ${lib.optionalString (lib.versions.major version == "12") - # error: auto-patchelf could not satisfy dependency libtiff.so.5 wanted by /nix/store/ivw2ss2ppafxww0f935dvqij5xkgvczz-cudatoolkit-12.0.1/host-linux-x64/Plugins/imageformats/libqtiff.so + ${lib.optionalString (lib.versionAtLeast version "11.8") + # 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 # we only ship libtiff.so.6, so let's use qt plugins built by Nix. # TODO: don't copy, come up with a symlink-based "merge" '' |