1
0
Fork 0
mirror of https://github.com/helix-editor/helix synced 2024-05-10 12:36:05 +02:00

build(nix): fix devshell

This commit is contained in:
Yusuf Bera Ertan 2023-02-25 07:06:30 +03:00
parent e5af0f1d49
commit 309735aa2d
No known key found for this signature in database
GPG Key ID: 1D8F8FAF2294D6EA
2 changed files with 6 additions and 4 deletions

View File

@ -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": {

View File

@ -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 = {