Merge pull request #1130 from onekey-sec/devenv-update

Devenv update
onekey-sec · Feb 13, 2025 · 9ae1131 · 9ae1131
2 parents 5abed8f + 8f1f70e
commit 9ae1131
Show file tree

Hide file tree

Showing 3 changed files with 68 additions and 450 deletions.
diff --git a/devenv.nix b/devenv.nix
@@ -1,6 +1,5 @@
 {
   config,
-  lib,
   pkgs,
   ...
 }:
@@ -23,6 +22,11 @@
         "dev"
       ];
     };
+    # https://github.com/vlaci/devenv-extras
+    extras = {
+      auto-patchelf.enable = true;
+      clear-ldpath.enable = true;
+    };
   };
   languages.rust.enable = true;
 
@@ -49,14 +53,5 @@
       after = [ "devenv:python:uv" ];
       before = [ "devenv:enterShell" ];
     };
-    "venv:patchelf" = {
-      exec = ''
-        for exe in taplo ruff; do
-          ${lib.getExe pkgs.patchelf} --set-interpreter ${pkgs.stdenv.cc.bintools.dynamicLinker} "${config.devenv.state}/venv/bin/$exe"
-        done
-      '';
-      after = [ "devenv:python:uv" ];
-      before = [ "devenv:enterShell" ];
-    };
   };
 }