Skip to content

Commit 9ae1131

Browse files
authored
Merge pull request #1130 from onekey-sec/devenv-update
Devenv update
2 parents 5abed8f + 8f1f70e commit 9ae1131

File tree

3 files changed

+68
-450
lines changed

3 files changed

+68
-450
lines changed

devenv.nix

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
config,
3-
lib,
43
pkgs,
54
...
65
}:
@@ -23,6 +22,11 @@
2322
"dev"
2423
];
2524
};
25+
# https://github.com/vlaci/devenv-extras
26+
extras = {
27+
auto-patchelf.enable = true;
28+
clear-ldpath.enable = true;
29+
};
2630
};
2731
languages.rust.enable = true;
2832

@@ -49,14 +53,5 @@
4953
after = [ "devenv:python:uv" ];
5054
before = [ "devenv:enterShell" ];
5155
};
52-
"venv:patchelf" = {
53-
exec = ''
54-
for exe in taplo ruff; do
55-
${lib.getExe pkgs.patchelf} --set-interpreter ${pkgs.stdenv.cc.bintools.dynamicLinker} "${config.devenv.state}/venv/bin/$exe"
56-
done
57-
'';
58-
after = [ "devenv:python:uv" ];
59-
before = [ "devenv:enterShell" ];
60-
};
6156
};
6257
}

0 commit comments

Comments
 (0)