public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

python.pkgs.virtualenv: rebase virtualenv-change-prefix.patch

Browse Source
This commit is contained in:
Robert Schütz 2019-02-14 15:53:32 +01:00 committed by Frederik Rietdijk
parent 45716f553d
commit 254099bf7d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/development/python-modules/virtualenv/virtualenv-change-prefix.patch
View File

@ -13,17 +13,17 @@ it will only add the path to the python used when building
available. available.
diff --git a/src/virtualenv.py b/src/virtualenv.py diff --git a/virtualenv.py b/virtualenv.py
index 4b57cde..afda73f 100755 index bcf3225..3530997 100755
--- a/src/virtualenv.py --- a/virtualenv.py
+++ b/src/virtualenv.py +++ b/virtualenv.py
@@ -1071,20 +1071,7 @@ def path_locations(home_dir, dry_run=False): @@ -1163,20 +1163,7 @@ def path_locations(home_dir, dry_run=False):
def change_prefix(filename, dst_prefix): def change_prefix(filename, dst_prefix):
- prefixes = [sys.prefix] - prefixes = [sys.prefix]
- -
- if is_darwin: - if IS_DARWIN:
- prefixes.extend( - prefixes.extend(
- ( - (
- os.path.join("/Library/Python", sys.version[:3], "site-packages"), - os.path.join("/Library/Python", sys.version[:3], "site-packages"),
@ -39,16 +39,16 @@ index 4b57cde..afda73f 100755
if hasattr(sys, "real_prefix"): if hasattr(sys, "real_prefix"):
prefixes.append(sys.real_prefix) prefixes.append(sys.real_prefix)
@@ -1107,6 +1094,8 @@ def change_prefix(filename, dst_prefix): @@ -1199,6 +1186,8 @@ def change_prefix(filename, dst_prefix):
if src_prefix != os.sep: # sys.prefix == "/" if src_prefix != os.sep: # sys.prefix == "/"
assert relpath[0] == os.sep assert relative_path[0] == os.sep
relpath = relpath[1:] relative_path = relative_path[1:]
+ if src_prefix == "/nix/store": + if src_prefix == "/nix/store":
+ relpath = "/".join(relpath.split("/")[1:]) + relative_path = "/".join(relative_path.split("/")[1:])
return join(dst_prefix, relpath) return join(dst_prefix, relative_path)
assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes) assert False, "Filename {} does not start with any of these prefixes: {}".format(filename, prefixes)
@@ -1233,6 +1222,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy @@ -1375,6 +1364,11 @@ def install_python(home_dir, lib_dir, inc_dir, bin_dir, site_packages, clear, sy
site_filename_dst = change_prefix(site_filename, home_dir) site_filename_dst = change_prefix(site_filename, home_dir)
site_dir = os.path.dirname(site_filename_dst) site_dir = os.path.dirname(site_filename_dst)
writefile(site_filename_dst, SITE_PY) writefile(site_filename_dst, SITE_PY)