From 725e8ab49c6a0014d963c9dffb769b65e5a527d4 Mon Sep 17 00:00:00 2001
From: nviets <nathan.g.viets@gmail.com>
Date: Tue, 20 Jun 2023 13:12:54 -0500
Subject: [PATCH] cudaPackages: bump default cudaPackages_11_7 ->
 cudaPackages_11_8 (#238622)

* cudaPackages: bump default cudaPackages_11_7 -> cudaPackages_11_8

* Switched format of cudaPackages.backendStdenv

Co-authored-by: Samuel Ainsworth <skainsworth@gmail.com>

* Removed reference to gcc11Stdenv in cuda-samples

* corrected stdenv reference in cuda-samples

---------

Co-authored-by: nviets <nathan.viets@gmail.com>
Co-authored-by: Samuel Ainsworth <skainsworth@gmail.com>
---
 pkgs/test/cuda/cuda-samples/generic.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix         |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/test/cuda/cuda-samples/generic.nix b/pkgs/test/cuda/cuda-samples/generic.nix
index eeb3d6fcb520..267eca10d8e8 100644
--- a/pkgs/test/cuda/cuda-samples/generic.nix
+++ b/pkgs/test/cuda/cuda-samples/generic.nix
@@ -1,14 +1,15 @@
 { lib
-, stdenv
+, cudaPackages
 , fetchFromGitHub
 , fetchpatch
 , addOpenGLRunpath
 , cudatoolkit
 , pkg-config
 , sha256
+, glfw3
+, freeimage
 }:
-
-stdenv.mkDerivation rec {
+cudaPackages.backendStdenv.mkDerivation rec {
   pname = "cuda-samples";
   version = lib.versions.majorMinor cudatoolkit.version;
 
@@ -19,7 +20,7 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  nativeBuildInputs = [ pkg-config addOpenGLRunpath ];
+  nativeBuildInputs = [ pkg-config addOpenGLRunpath glfw3 freeimage ];
 
   buildInputs = [ cudatoolkit ];
 
@@ -40,7 +41,7 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 -t $out/bin bin/${stdenv.hostPlatform.parsed.cpu.name}/${stdenv.hostPlatform.parsed.kernel.name}/release/*
+    install -Dm755 -t $out/bin bin/${cudaPackages.backendStdenv.hostPlatform.parsed.cpu.name}/${cudaPackages.backendStdenv.hostPlatform.parsed.kernel.name}/release/*
 
     runHook postInstall
   '';
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6d9ad452583a..e7a432c67f0c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6767,7 +6767,7 @@ with pkgs;
   cudaPackages_11_6 = callPackage ./cuda-packages.nix { cudaVersion = "11.6"; };
   cudaPackages_11_7 = callPackage ./cuda-packages.nix { cudaVersion = "11.7"; };
   cudaPackages_11_8 = callPackage ./cuda-packages.nix { cudaVersion = "11.8"; };
-  cudaPackages_11 = cudaPackages_11_7;
+  cudaPackages_11 = cudaPackages_11_8;
 
   cudaPackages_12_0 = callPackage ./cuda-packages.nix { cudaVersion = "12.0"; };
   cudaPackages_12_1 = callPackage ./cuda-packages.nix { cudaVersion = "12.1"; };