Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove custom python override #5

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Remove custom python override #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion pkgs/python_ot/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
];
}
20 changes: 0 additions & 20 deletions pkgs/python_ot/python.nix
View file
Open in desktop

This file was deleted.

44 changes: 0 additions & 44 deletions pkgs/python_ot/sitecustomize.py
View file
Open in desktop

This file was deleted.