mirrors/zed
1
0
Fork 0
mirror of https://github.com/zed-industries/zed.git synced 2024-12-27 19:02:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

nix: Fix (potential) glibc errors in dev shell (#17974)

Browse source 
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
This commit is contained in:
Marek Fajkus 2024-09-18 18:51:11 +02:00 committed by GitHub
parent a7977aa64d
commit eda7e88fd4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
nix/shell.nix
View file

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