From eda7e88fd4a9e500c951344f6ddd659ee13ca0fc Mon Sep 17 00:00:00 2001
From: Marek Fajkus <marek.faj@gmail.com>
Date: Wed, 18 Sep 2024 18:51:11 +0200
Subject: [PATCH] nix: Fix (potential) glibc errors in dev shell (#17974)

Previously the rustc and cargo did were not declared dependencies
supplied to devshell. This means that shell relied some impure cargo and
rustc version found in the system. This lead to issues with GLIBC
version on systems which have different GLIBC version globally.

This package exposes nixpkgs rustc and cargo version into the shell
preventing issues with incompatibility.

Release Notes:

- N/A
---
 nix/shell.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nix/shell.nix b/nix/shell.nix
index 03e298e132..476374b67e 100644
--- a/nix/shell.nix
+++ b/nix/shell.nix
@@ -20,6 +20,8 @@ in
       wayland
       xorg.libxcb
       vulkan-loader
+      rustc
+      cargo
     ];
   in
     pkgs.mkShell.override {inherit stdenv;} {
@@ -36,10 +38,7 @@ in
       inherit buildInputs;
 
       shellHook = ''
-        export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath ([
-            pkgs.vulkan-loader
-          ]
-          ++ buildInputs)}:$LD_LIBRARY_PATH"
+        export LD_LIBRARY_PATH="${pkgs.lib.makeLibraryPath buildInputs}:$LD_LIBRARY_PATH"
         export PROTOC="${pkgs.protobuf}/bin/protoc"
       '';