git.iko.soy/helix
on master help sign in
build(nix): fix devshell
commit309735aa2d9516a734165ee066f2c9a080f9849a authorYusuf Bera Ertan <y.bera003.06@protonmail.com> dateSat 25 Feb 2023, 07:06 (4 years ago) parente5af0f1
2 files changed+6−4
compare with master
unifiedsplit
flake.lock+3−3 flake.nix+3−1
flake.lock+3−3
@@ -119,11 +119,11 @@
119119 ]
120120 },
121121 "locked": {
122− "lastModified": 1677294491,
123− "narHash": "sha256-p09IOJqhUOM6egRJe4Ou1EXdTs/I9Pmm8e7pMYDlIWM=",
122+ "lastModified": 1677297103,
123+ "narHash": "sha256-ArlJIbp9NGV9yvhZdV0SOUFfRlI/kHeKoCk30NbSiLc=",
124124 "owner": "yusdacra",
125125 "repo": "nix-cargo-integration",
126− "rev": "a525ed36c440854f296cd958f4ebf574f0ebe22c",
126+ "rev": "a79272a2cb0942392bb3a5bf9a3ec6bc568795b2",
127127 "type": "github"
128128 },
129129 "original": {
flake.nix+3−1
@@ -120,9 +120,11 @@
120120 else pkgs.clangStdenv;
121121 rustFlagsEnv =
122122 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''
124124 else "$RUSTFLAGS";
125125 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"];
126128 nci.projects."helix-project".relPath = "";
127129 nci.crates."helix-term" = {
128130 overrides = {