From f5c6c167f1c278acba071a03309ffc3782e7759f Mon Sep 17 00:00:00 2001 From: SomeoneSerge Date: Wed, 7 May 2025 19:05:46 +0000 Subject: [PATCH] cudaPackages.autoAddCudaCompatRunpath: badPlatforms broken For consistency with other packages and for meta.unsupported --- .../autoAddCudaCompatRunpath/package.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix index e94fbe485283c..5dc6d64e65516 100644 --- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix +++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix @@ -6,8 +6,6 @@ { autoFixElfFiles, cuda_compat ? null, - flags, - lib, makeSetupHook, }: makeSetupHook { @@ -15,13 +13,17 @@ makeSetupHook { propagatedBuildInputs = [ autoFixElfFiles ]; substitutions = { - # Hotfix Ofborg evaluation - libcudaPath = if flags.isJetsonBuild then "${cuda_compat}/compat" else null; + libcudaPath = "${cuda_compat}/compat"; }; - meta.broken = !flags.isJetsonBuild; - - # Pre-cuda_compat CUDA release: - meta.badPlatforms = lib.optionals (cuda_compat == null) lib.platforms.all; - meta.platforms = cuda_compat.meta.platforms or [ ]; + meta = + let + # Handle `null`s in pre-`cuda_compat` releases, + # and `badPlatform`s for `!isJetsonBuild`. + platforms = cuda_compat.meta.platforms or [ ]; + badPlatforms = cuda_compat.meta.badPlatforms or platforms; + in + { + inherit badPlatforms platforms; + }; } ./auto-add-cuda-compat-runpath.sh