This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
-
-
Notifications
You must be signed in to change notification settings - Fork 2.1k
Add GCC and GNU Make to the Nix flake development environment so that ruff
can be compiled.
#16090
Merged
Merged
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
Add GCC and GNU Make to the Nix flake development environment so that `ruff` can be compiled. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change | ||||||||
---|---|---|---|---|---|---|---|---|---|---|
|
@@ -89,6 +89,10 @@ | |||||||||
}) | ||||||||||
# The rust-analyzer language server implementation. | ||||||||||
rust-analyzer | ||||||||||
# GCC includes a linker; needed for building `ruff` | ||||||||||
gcc | ||||||||||
# Needed for building `ruff` | ||||||||||
gnumake | ||||||||||
|
||||||||||
# Native dependencies for running Synapse. | ||||||||||
icu | ||||||||||
|
@@ -236,6 +240,19 @@ | |||||||||
URI | ||||||||||
YAMLLibYAML | ||||||||||
]}"; | ||||||||||
|
||||||||||
# Clear the LD_LIBRARY_PATH environment variable on shell init. | ||||||||||
# | ||||||||||
# By default, devenv will set LD_LIBRARY_PATH to point to .devenv/profile/lib. This causes | ||||||||||
# issues when we include `gcc` as a dependency to build C libraries, as the version of glibc | ||||||||||
# that the development environment's cc compiler uses may differ from that of the system. | ||||||||||
# | ||||||||||
# When LD_LIBRARY_PATH is set, system tools will attempt to use the development environment's | ||||||||||
# libraries. Which, when built against an different glibc version lead, to "version 'GLIBC_X.YY' not | ||||||||||
# found" errors. | ||||||||||
Comment on lines
+251
to
+252
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Correcting past me.
Suggested change
|
||||||||||
enterShell = '' | ||||||||||
unset LD_LIBRARY_PATH | ||||||||||
''; | ||||||||||
} | ||||||||||
]; | ||||||||||
}; | ||||||||||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've been trying to separate distinct sections with a space :)