Make RustRover work with Rust from Nixpkgs
jetbrains
nix
rust
fix: pass env to rustc wrapper
+8
-3
+8
-3
default.nix
+8
-3
default.nix
···
82
82
echo "Sysroot created at ${sysrootDir}"
83
83
'';
84
84
85
+
sourceEnv = ''
86
+
if [ -f "${envFile}" ]; then
87
+
set -a && source "${envFile}" && set +a
88
+
fi
89
+
'';
90
+
85
91
rustcWrapper = writeShellScriptBin "rustc" ''
92
+
${sourceEnv}
86
93
if [ "$1" = "--print" ] && [ "$2" = "sysroot" ]; then
87
94
echo ${sysrootDir}
88
95
else
···
91
98
'';
92
99
93
100
rustupWrapper = writeShellScriptBin "rustup" ''
94
-
if [ -f "${envFile}" ]; then
95
-
set -a && source "${envFile}" && set +a
96
-
fi
101
+
${sourceEnv}
97
102
if [ "$1" = "component" ] && [ "$2" = "list" ]; then
98
103
shift 2
99
104
exec ${./list-components.sh} ${sysrootDir} "$@"