summary refs log tree commit diff
diff options
context:
space:
mode:
authorreivilibre <oliverw@matrix.org>2023-09-06 15:15:56 +0000
committerGitHub <noreply@github.com>2023-09-06 16:15:56 +0100
commit51303035f2366d60772473f42c64ae6cad6684d0 (patch)
treec2d45d56eeba16306910e358f08bcc7610187199
parentAdd GCC and GNU Make to the Nix flake development environment so that `ruff` ... (diff)
downloadsynapse-51303035f2366d60772473f42c64ae6cad6684d0.tar.xz
Apply missed suggestions from the review of #16090. (#16263)
* Suggestions from PR

* Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>

---------

Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
-rw-r--r--changelog.d/16263.misc1
-rw-r--r--flake.nix5
2 files changed, 4 insertions, 2 deletions
diff --git a/changelog.d/16263.misc b/changelog.d/16263.misc
new file mode 100644
index 0000000000..d54ef936c7
--- /dev/null
+++ b/changelog.d/16263.misc
@@ -0,0 +1 @@
+Add GCC and GNU Make to the Nix flake development environment so that `ruff` can be compiled.
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 69c9c19f89..31f2832939 100644
--- a/flake.nix
+++ b/flake.nix
@@ -89,6 +89,7 @@
                   })
                   # The rust-analyzer language server implementation.
                   rust-analyzer
+
                   # GCC includes a linker; needed for building `ruff`
                   gcc
                   # Needed for building `ruff`
@@ -248,8 +249,8 @@
                 # 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.
+                # libraries. Which, when built against a different glibc version lead, to "version 'GLIBC_X.YY'
+                # not found" errors.
                 enterShell = ''
                   unset LD_LIBRARY_PATH
                 '';