From 3543eaf4ff58a879fffa7c273ca502964f7c4733 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Nov 2023 19:59:11 +0000 Subject: [PATCH] cudaPackages.cuda-samples: use packages from cudaPackages scope; not top-level --- pkgs/test/cuda/cuda-samples/generic.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix index e57be1723436..94d96fc4f1aa 100644 --- a/pkgs/test/cuda/cuda-samples/generic.nix +++ b/pkgs/test/cuda/cuda-samples/generic.nix @@ -1,17 +1,18 @@ { lib -, cudaPackages +, backendStdenv , fetchFromGitHub , fetchpatch , autoAddOpenGLRunpathHook , cudatoolkit +, cudaVersion , pkg-config , sha256 , glfw3 , freeimage }: -cudaPackages.backendStdenv.mkDerivation (finalAttrs: { +backendStdenv.mkDerivation (finalAttrs: { pname = "cuda-samples"; - version = lib.versions.majorMinor cudatoolkit.version; + version = cudaVersion; src = fetchFromGitHub { owner = "NVIDIA"; @@ -41,7 +42,7 @@ cudaPackages.backendStdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/* + install -Dm755 -t $out/bin bin/${backendStdenv.hostPlatform.parsed.cpu.name}/${backendStdenv.hostPlatform.parsed.kernel.name}/release/* runHook postInstall '';