aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--flake.lock6
-rw-r--r--flake.nix4
2 files changed, 6 insertions, 4 deletions
diff --git a/flake.lock b/flake.lock
index de72c612..fa292273 100644
--- a/flake.lock
+++ b/flake.lock
@@ -119,11 +119,11 @@
]
},
"locked": {
- "lastModified": 1677294491,
- "narHash": "sha256-p09IOJqhUOM6egRJe4Ou1EXdTs/I9Pmm8e7pMYDlIWM=",
+ "lastModified": 1677297103,
+ "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
- "rev": "a525ed36c440854f296cd958f4ebf574f0ebe22c",
+ "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
"type": "github"
},
"original": {
diff --git a/flake.nix b/flake.nix
index 66fb641d..2ac76488 100644
--- a/flake.nix
+++ b/flake.nix
@@ -120,9 +120,11 @@
else pkgs.clangStdenv;
rustFlagsEnv =
if stdenv.isLinux
- then "$RUSTFLAGS\" -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment\""
+ then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
else "$RUSTFLAGS";
in {
+ # by default NCI adds rust-analyzer component, but helix toolchain doesn't have rust-analyzer
+ nci.toolchains.shell.components = ["rust-src" "rustfmt" "clippy"];
nci.projects."helix-project".relPath = "";
nci.crates."helix-term" = {
overrides = {