Merge pull request #5 from lowRISC/python

Remove custom python override
lowRISC · Jan 2, 2024 · ffe3a76 · ffe3a76
2 parents 2bcab64 + 4242a3a
commit ffe3a76
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 65 deletions.
diff --git a/pkgs/python_ot/default.nix b/pkgs/python_ot/default.nix
@@ -59,13 +59,21 @@
       preferWheel = true;
     };
   };
+
+  # Nix wraps python programs which causes PATH to change. We want to keep
+  # PATH in case a program needs to invoke user-defined programs.
+  dontwrap-overlay = final: prev: {
+    fusesoc = prev.fusesoc.overridePythonAttrs {
+      dontWrapPythonPrograms = true;
+    };
+  };
 in
   poetry2nix.mkPoetryEnv {
     projectDir = ./.;
-    python = import ./python.nix {python = python3;};
     overrides = [
       preferwheel-overlay
       buildreqs-overlay
+      dontwrap-overlay
       poetry2nix.defaultPoetryOverrides
     ];
   }
diff --git a/pkgs/python_ot/python.nix b/pkgs/python_ot/python.nix
diff --git a/pkgs/python_ot/sitecustomize.py b/pkgs/python_ot/sitecustomize.py