git.iko.soy/helix
on master help sign in
flake: Fix devshell for darwin hosts (#5368)
d6704edMichael Davis
flake.nix+5−4
compare with master
unifiedsplit
@@ -82,7 +82,8 @@
82 packages = with common.pkgs;
82 packages = with common.pkgs;
83 [lld_13 cargo-flamegraph rust-analyzer]
83 [lld_13 cargo-flamegraph rust-analyzer]
84 ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
84 ++ (lib.optional (stdenv.isx86_64 && stdenv.isLinux) cargo-tarpaulin)
85− ++ (lib.optional stdenv.isLinux lldb);
85+ ++ (lib.optional stdenv.isLinux lldb)
86+ ++ (lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.CoreFoundation);
86 env = [
87 env = [
87 {
88 {
88 name = "HELIX_RUNTIME";
89 name = "HELIX_RUNTIME";
@@ -94,10 +95,10 @@
94 }
95 }
95 {
96 {
96 name = "RUSTFLAGS";
97 name = "RUSTFLAGS";
97− value =
98+ eval =
98 if common.pkgs.stdenv.isLinux
99 if common.pkgs.stdenv.isLinux
99− then "-C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment"
100+ then "$RUSTFLAGS\" -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment\""
100− else "";
101+ else "$RUSTFLAGS";
101 }
102 }
102 ];
103 ];
103 };
104 };