From fbfe0b610e06300f78646a08cb7171e3a2853447 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 5 Apr 2026 02:51:37 +0300
Subject: [PATCH] rust/hooks: replace // optionalAttrs with nullable attr names

Convert 5 identical optionalAttrs (stdenv.isLinux) for testCross
in cargo{Build,Check,Install,Nextest,Setup}Hook passthru.tests.
---
 pkgs/build-support/rust/hooks/default.nix | 25 +++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/build-support/rust/hooks/default.nix b/pkgs/build-support/rust/hooks/default.nix
index 0814f78edfef..1cfb56f785c0 100644
--- a/pkgs/build-support/rust/hooks/default.nix
+++ b/pkgs/build-support/rust/hooks/default.nix
@@ -26,9 +26,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoBuildHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoBuildHook;
     };
   } ./cargo-build-hook.sh;
 
@@ -40,9 +39,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoCheckHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoCheckHook;
     };
   } ./cargo-check-hook.sh;
 
@@ -53,9 +51,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoInstallHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoInstallHook;
     };
   } ./cargo-install-hook.sh;
 
@@ -67,9 +64,8 @@
     };
     passthru.tests = {
       test = tests.rust-hooks.cargoNextestHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoNextestHook;
     };
   } ./cargo-nextest-hook.sh;
 
@@ -106,9 +102,8 @@
 
     passthru.tests = {
       test = tests.rust-hooks.cargoSetupHook;
-    }
-    // lib.optionalAttrs (stdenv.hostPlatform.isLinux) {
-      testCross = pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
+      ${if stdenv.hostPlatform.isLinux then "testCross" else null} =
+        pkgsCross.riscv64.tests.rust-hooks.cargoSetupHook;
     };
   } ./cargo-setup-hook.sh;