From 1ac9eb56048f9993109034811fdc9a06248e3e86 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 19 Feb 2026 22:38:07 +0100
Subject: [PATCH] python3Packages.cupy: move env vars into env for
 structuredAttrs

---
 pkgs/development/python-modules/cupy/default.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 3af28161ba4e..c8793df35e88 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -62,10 +62,14 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } rec {
     fetchSubmodules = true;
   };
 
-  env.LDFLAGS = toString [
-    # Fake libcuda.so (the real one is deployed impurely)
-    "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
-  ];
+  env = {
+    LDFLAGS = toString [
+      # Fake libcuda.so (the real one is deployed impurely)
+      "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
+    ];
+    # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
+    CUDA_PATH = "${cudatoolkit-joined}";
+  };
 
   # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Setting both
   # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in
@@ -95,9 +99,6 @@ buildPythonPackage.override { stdenv = cudaPackages.backendStdenv; } rec {
     nccl
   ];
 
-  # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
-  CUDA_PATH = "${cudatoolkit-joined}";
-
   dependencies = [
     fastrlock
     numpy