diff options
| author | Stuart Cook <Zalathar@users.noreply.github.com> | 2025-09-01 17:35:04 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-09-01 17:35:04 +1000 |
| commit | 325bb43f553c28bfe2aa4ba04fc9b8c709d493b9 (patch) | |
| tree | f11778fc9898c33fc5926a021aed45766badcc29 /src | |
| parent | 0972fd9d4188dc0bbe3db7f4f44344591af1f3ef (diff) | |
| parent | 43e535947b9ad8d951cde1bed626883cdd00bdf1 (diff) | |
| download | rust-325bb43f553c28bfe2aa4ba04fc9b8c709d493b9.tar.gz rust-325bb43f553c28bfe2aa4ba04fc9b8c709d493b9.zip | |
Rollup merge of #146060 - WaffleLapkin:fixup-nix-dev-shell-again, r=Noratrieb
fixup nix dev shell again r? Noratrieb
Diffstat (limited to 'src')
| -rw-r--r-- | src/tools/nix-dev-shell/shell.nix | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/tools/nix-dev-shell/shell.nix b/src/tools/nix-dev-shell/shell.nix index ad33b121f97..6ca8a7c4652 100644 --- a/src/tools/nix-dev-shell/shell.nix +++ b/src/tools/nix-dev-shell/shell.nix @@ -14,6 +14,7 @@ pkgs.mkShell { packages = [ pkgs.git pkgs.nix + pkgs.glibc.out pkgs.glibc.static x # Get the runtime deps of the x wrapper @@ -23,5 +24,7 @@ pkgs.mkShell { # Avoid creating text files for ICEs. RUSTC_ICE = 0; SSL_CERT_FILE = cacert; + # cargo seems to dlopen libcurl, so we need it in the ld library path + LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [pkgs.stdenv.cc.cc.lib pkgs.curl]}"; }; } |
