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

python: remove LD_LIBRARY_PATH hack from running python environment #1562

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

python: remove LD_LIBRARY_PATH hack from running python environment #1562

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
26 changes: 26 additions & 0 deletions src/modules/languages/python.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,9 @@ let
python = cfg.package;
requiredPythonModules = cfg.package.pkgs.requiredPythonModules;
makeWrapperArgs = [
"--set"
"DEVENV_LD_LIBRARY_PATH_PREFIX"
libraries
"--prefix"
"LD_LIBRARY_PATH"
":"
Expand All @@ -39,6 +42,20 @@ let
follows = [ "nixpkgs" ];
};

pth_file =
let
exec_content = ''
ld_library_path = os.environ.get("LD_LIBRARY_PATH")
ld_library_path_prefix = os.environ.get("DEVENV_LD_LIBRARY_PATH_PREFIX")
if ld_library_path and ld_library_path_prefix:
if ld_library_path == ld_library_path_prefix:
del os.environ["LD_LIBRARY_PATH"]
else:
os.environ["LD_LIBRARY_PATH"] = ld_library_path.removeprefix(ld_library_path_prefix + ":")
'';
in
pkgs.writeText "devenv.pth" ''import os; exec("""${builtins.replaceStrings [ "\n" ] [ "\\n" ] exec_content}""")'';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this need exec? I thought it might be possible to be executed in pth as-is.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pth is executed line by line, so this is the only way to use multi-line constructs like if conditions


initVenvScript =
let
USE_UV_SYNC = cfg.uv.sync.enable && builtins.compareVersions cfg.uv.package.version "0.4.4" >= 0;
Expand Down Expand Up @@ -80,6 +97,9 @@ let
''
}
echo "${package.interpreter}" > "$VENV_PATH/.devenv_interpreter"
${lib.optionalString pkgs.stdenv.isLinux ''
ln -snf ${pth_file} "$VENV_PATH/${package.sitePackages}/devenv.pth"
''}
fi

source "$VENV_PATH"/bin/activate
Expand Down Expand Up @@ -157,6 +177,9 @@ let
if "''${UV_SYNC_COMMAND[@]}"
then
echo "$ACTUAL_UV_CHECKSUM" > "$UV_CHECKSUM_FILE"
${lib.optionalString pkgs.stdenv.isLinux ''
ln -snf ${pth_file} "$VENV_PATH/${package.sitePackages}/devenv.pth"
''}
else
echo "uv sync failed. Run 'uv sync' manually." >&2
fi
Expand Down Expand Up @@ -206,6 +229,9 @@ let
if ''${POETRY_INSTALL_COMMAND[@]}
then
echo "$ACTUAL_POETRY_CHECKSUM" > "$POETRY_CHECKSUM_FILE"
${lib.optionalString pkgs.stdenv.isLinux ''
ln -snf ${pth_file} ".venv/${package.sitePackages}/devenv.pth"
''}
else
echo "Poetry install failed. Run 'poetry install' manually."
fi
Expand Down