Skip to content

Commit 46d3de5

Browse files
vlacikissgyorgy
authored andcommitted
fix(devenv): update from my fork to official repository
Shove away reworked compatibility hacks in https://github.com/vlaci/devenv-extras
1 parent 5abed8f commit 46d3de5

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
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
}

flake.nix

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88
flake = false;
99
};
1010
inputs.devenv = {
11-
url = "github:vlaci/devenv/python-wrapper";
11+
url = "github:cachix/devenv";
1212
inputs.nixpkgs.follows = "nixpkgs";
1313
};
1414

15+
inputs.devenv-extras.url = "github:vlaci/devenv-extras";
16+
1517
nixConfig = {
1618
extra-substituters = [ "https://unblob.cachix.org" ];
1719
extra-trusted-public-keys = [
@@ -24,6 +26,7 @@
2426
self,
2527
nixpkgs,
2628
devenv,
29+
devenv-extras,
2730
filter,
2831
...
2932
}@inputs:
@@ -109,6 +112,7 @@
109112
pkgs = nixpkgsFor.${system};
110113
modules = [
111114
./devenv.nix
115+
devenv-extras.devenvModules.default
112116
];
113117
};
114118
});

0 commit comments

Comments
 (0)