From 35934b02a98cbb44ba310707a72e55bc4a5c7f0a Mon Sep 17 00:00:00 2001
From: reivilibre <oliverw@matrix.org>
Date: Wed, 6 Sep 2023 13:35:02 +0000
Subject: [PATCH] Add GCC and GNU Make to the Nix flake development environment
so that `ruff` can be compiled. (#16090)
* Add gcc and GNU make to the Nix flake
* Newsfile
Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
* unset LD_LIBRARY_PATH
---------
Signed-off-by: Olivier Wilkinson (reivilibre) <oliverw@matrix.org>
---
changelog.d/16090.misc | 1 +
flake.nix | 17 +++++++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 changelog.d/16090.misc
diff --git a/changelog.d/16090.misc b/changelog.d/16090.misc
new file mode 100644
index 0000000000..d54ef936c7
--- /dev/null
+++ b/changelog.d/16090.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 dc7ab5b3fe..69c9c19f89 100644
--- a/flake.nix
+++ b/flake.nix
@@ -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.
+ enterShell = ''
+ unset LD_LIBRARY_PATH
+ '';
}
];
};
--
GitLab