Commit 325bb43

authored

Rollup merge of #146060 - WaffleLapkin:fixup-nix-dev-shell-again, r=Noratrieb

fixup nix dev shell again r? Noratrieb

2 parents 0972fd9 + 43e5359 commit 325bb43Copy full SHA for 325bb43

File tree

-0

lines changed

-0

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ pkgs.mkShell {`
`14`	`14`	`packages = [`
`15`	`15`	`pkgs.git`
`16`	`16`	`pkgs.nix`
	`17`	`+ pkgs.glibc.out`
`17`	`18`	`pkgs.glibc.static`
`18`	`19`	`x`
`19`	`20`	`# Get the runtime deps of the x wrapper`
`@@ -23,5 +24,7 @@ pkgs.mkShell {`
`23`	`24`	`# Avoid creating text files for ICEs.`
`24`	`25`	`RUSTC_ICE = 0;`
`25`	`26`	`SSL_CERT_FILE = cacert;`
	`27`	`+ # cargo seems to dlopen libcurl, so we need it in the ld library path`
	`28`	`+ LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath [pkgs.stdenv.cc.cc.lib pkgs.curl]}";`
`26`	`29`	`};`
`27`	`30`	`}`

Comments

(0)