fe6d9366c9
Hardcode path to pip so octoprint will find it and recognize it cannot write to its install dir with the /nix/store. This causes less, at least when looking at the log output, compared to not having pip accessible at all. Hardcore path to ffmpeg, because it is not reasonable on a NixOS setup to not treat this as a dependency. At the same time we hide the related settings form, so the user cannot overwrite it. Having the user input a sensible path would require installing ffmpeg into the environment, not a great solution, so patching it is.
12 lines
405 B
Diff
12 lines
405 B
Diff
diff --git a/src/octoprint/util/pip.py b/src/octoprint/util/pip.py
|
|
index 53500e5d5..39f76c1e5 100644
|
|
--- a/src/octoprint/util/pip.py
|
|
+++ b/src/octoprint/util/pip.py
|
|
@@ -284,6 +284,7 @@ class PipCaller(CommandlineCaller):
|
|
@classmethod
|
|
def autodetect_pip(cls):
|
|
commands = [
|
|
+ ["@pip@"],
|
|
[sys.executable, "-m", "pip"],
|
|
[
|
|
os.path.join(
|