git.iko.soy/helix
on master help sign in
build(nix): fix devshell
309735aYusuf Bera Ertan
flake.lock+3−3
compare with master
unifiedsplit
@@ -119,11 +119,11 @@
119 ]
119 ]
120 },
120 },
121 "locked": {
121 "locked": {
122− "lastModified": 1677294491,
122+ "lastModified": 1677297103,
123− "narHash": "sha256-p09IOJqhUOM6egRJe4Ou1EXdTs/I9Pmm8e7pMYDlIWM=",
123+ "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
124 "owner": "yusdacra",
124 "owner": "yusdacra",
125 "repo": "nix-cargo-integration",
125 "repo": "nix-cargo-integration",
126− "rev": "a525ed36c440854f296cd958f4ebf574f0ebe22c",
126+ "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
127 "type": "github"
127 "type": "github"
128 },
128 },
129 "original": {
129 "original": {
flake.nix+3−1
@@ -120,9 +120,11 @@
120 else pkgs.clangStdenv;
120 else pkgs.clangStdenv;
121 rustFlagsEnv =
121 rustFlagsEnv =
122 if stdenv.isLinux
122 if stdenv.isLinux
123− then "$RUSTFLAGS\" -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment\""
123+ then ''$RUSTFLAGS -C link-arg=-fuse-ld=lld -C target-cpu=native -Clink-arg=-Wl,--no-rosegment''
124 else "$RUSTFLAGS";
124 else "$RUSTFLAGS";
125 in {
125 in {
126+ # by default NCI adds rust-analyzer component, but helix toolchain doesn't have rust-analyzer
127+ nci.toolchains.shell.components = ["rust-src" "rustfmt" "clippy"];
126 nci.projects."helix-project".relPath = "";
128 nci.projects."helix-project".relPath = "";
127 nci.crates."helix-term" = {
129 nci.crates."helix-term" = {
128 overrides = {
130 overrides = {