From afd4f369d038d36ca5c9f70509ab1aa4087ded26 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Fri, 5 Aug 2022 22:44:09 +0800 Subject: [PATCH] windows: fix python module installation paths --- flake.lock | 8 ++++---- windows/PKGBUILD.common | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index fbb0e9649..07238c01f 100644 --- a/flake.lock +++ b/flake.lock @@ -45,11 +45,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1659695040, - "narHash": "sha256-vJG1IsDJ1KMbAf9jEIwsVsC6NDiGYst4/o4k9xPBqaI=", + "lastModified": 1659710552, + "narHash": "sha256-BFM0wnEaWFBHwHNET2KZBB0LxKGA44asnDBnMXQ6KMA=", "ref": "master", - "rev": "fff4b651697263f403f5270d09c08797572a3719", - "revCount": 797, + "rev": "813bfa92a7b56fa5fe8d11bac4c224b84903e7c0", + "revCount": 798, "type": "git", "url": "https://git.m-labs.hk/m-labs/nac3.git" }, diff --git a/windows/PKGBUILD.common b/windows/PKGBUILD.common index e5d8e2a74..504785679 100644 --- a/windows/PKGBUILD.common +++ b/windows/PKGBUILD.common @@ -7,7 +7,7 @@ sha256sums=("SKIP") build() { mkdir mingw64 - export PYTHONPATH=`pwd`/mingw64/lib/python3.9/site-packages + export PYTHONPATH=`pwd`/mingw64/lib/python3.10/site-packages chmod +w -R source cd source wine-msys2-build python setup.py install --single-version-externally-managed --prefix=../mingw64 --record=setuptools-sucks.txt @@ -15,7 +15,7 @@ build() { # setuptools creates this file if it doesn't already exist, which causes conflicts between pacman packages # see: https://corte.si/posts/code/setuptoolssucks/ - rm -f mingw64/lib/python3.9/site-packages/easy-install.pth + rm -f mingw64/lib/python3.10/site-packages/easy-install.pth # patch broken shebangs (Z:/nix/store/...) for entrypoint in mingw64/bin/*-script.py; do [ -f "$entrypoint" ] || continue