diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-16 02:02:58 -0400 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2021-07-16 06:39:08 -0400 |
| commit | d5577087616bc7e9e1933e865984b479cfe26864 (patch) | |
| tree | 5e2f822e999d0d557ade37860557c68d93db4f84 /pkgs/development/interpreters | |
| parent | b43959a817c115d92d5adcf7c6db80e58aa22e92 (diff) | |
| download | nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar.gz nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar.bz2 nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar.lz nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar.xz nixlib-d5577087616bc7e9e1933e865984b479cfe26864.tar.zst nixlib-d5577087616bc7e9e1933e865984b479cfe26864.zip | |
pypy: don't try to fetch vendored dependencies for cffi bindings
Specifically, this affects _ssl and lzma. This should be useful on Hydra/macOS where sandboxing is disabled.
Diffstat (limited to 'pkgs/development/interpreters')
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch | 12 |
2 files changed, 14 insertions, 0 deletions
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 1f229c7d34e2..e4e95ad4c57d 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -73,6 +73,8 @@ in with passthru; stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath (filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs); patches = [ + ./dont_fetch_vendored_deps.patch + (substituteAll { src = ./tk_tcl_paths.patch; inherit tk tcl; diff --git a/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch new file mode 100644 index 000000000000..bc959e15d1af --- /dev/null +++ b/pkgs/development/interpreters/python/pypy/dont_fetch_vendored_deps.patch @@ -0,0 +1,12 @@ +diff -ur a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py +--- a/lib_pypy/pypy_tools/build_cffi_imports.py 2021-04-12 01:11:48.000000000 -0400 ++++ b/lib_pypy/pypy_tools/build_cffi_imports.py 2021-07-16 06:37:03.000000000 -0400 +@@ -225,6 +225,8 @@ + + print('*', ' '.join(args), file=sys.stderr) + if embed_dependencies and key in cffi_dependencies: ++ print("Nixpkgs: skipping fetching/building dependency", key) ++ elif False: + status, stdout, stderr = _build_dependency(key) + if status != 0: + failures.append((key, module)) |