From 309735aa2d9516a734165ee066f2c9a080f9849a Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Sat, 25 Feb 2023 07:06:30 +0300
Subject: [PATCH] build(nix): fix devshell

---
 flake.lock | 6 +++---
 flake.nix  | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/flake.lock b/flake.lock
index de72c612a..fa292273a 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 66fb641d9..2ac764888 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 = {