From 8b27ae6b8c050f93ee582a41bdee18ff67550be6 Mon Sep 17 00:00:00 2001 From: Peter Mescalchin Date: Fri, 28 Aug 2020 17:08:33 +1000 Subject: [PATCH 1/2] Adding Python manifest lib path to LD_LIBRARY_PATH before installing pip --- installers/nix-setup-template.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index 21d72b88..6197d5df 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -49,6 +49,7 @@ fi chmod +x ../python $PYTHON_MAJOR $PYTHON_MAJOR_DOT_MINOR $PYTHON_MAJORMINOR python echo "Upgrading PIP..." +export LD_LIBRARY_PATH="$PYTHON_TOOLCACHE_VERSION_ARCH_PATH/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" ./python -m ensurepip ./python -m pip install --ignore-installed pip From 62b0db9f7448216d561c2a1fc0aad87b527183d5 Mon Sep 17 00:00:00 2001 From: Peter Mescalchin Date: Thu, 17 Sep 2020 09:23:50 +1000 Subject: [PATCH 2/2] Use actual path in 'Copy Python...' message --- installers/nix-setup-template.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/nix-setup-template.sh b/installers/nix-setup-template.sh index 6197d5df..560db853 100644 --- a/installers/nix-setup-template.sh +++ b/installers/nix-setup-template.sh @@ -31,7 +31,7 @@ fi echo "Create Python $PYTHON_FULL_VERSION folder" mkdir -p $PYTHON_TOOLCACHE_VERSION_ARCH_PATH -echo "Copy Python binaries to hostedtoolcache folder" +echo "Copy Python binaries to $PYTHON_TOOLCACHE_VERSION_ARCH_PATH" cp -R ./* $PYTHON_TOOLCACHE_VERSION_ARCH_PATH rm $PYTHON_TOOLCACHE_VERSION_ARCH_PATH/setup.sh