From 1c5c18407966dd9b22f459c69a7fb225a4b85306 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 13 Feb 2021 10:08:52 -0800 Subject: pythonInterpreters.pypy36_prebuilt: Add missing lib argument This was broken by commit 001c0cbe54228f88d5634f431fcaf460b8ff4590 (#110591). Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/prebuilt.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/python') diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index f301fd15f09..fa87c8f7832 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -1,4 +1,5 @@ -{ stdenv +{ lib +, stdenv , fetchurl , python-setup-hook , self -- cgit 1.4.1 From d08ec2f1956b8b630e5f2026ebb4c5ed06e24e81 Mon Sep 17 00:00:00 2001 From: Anders Kaseorg Date: Sat, 13 Feb 2021 10:14:06 -0800 Subject: pythonInterpreters.pypy36_prebuilt: Set pythonOnBuildForHost This was broken by #105155. Signed-off-by: Anders Kaseorg --- pkgs/development/interpreters/python/pypy/prebuilt.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'pkgs/development/interpreters/python') diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix index fa87c8f7832..460af1cc67b 100644 --- a/pkgs/development/interpreters/python/pypy/prebuilt.nix +++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix @@ -32,9 +32,15 @@ let implementation = "pypy"; libPrefix = "pypy${pythonVersion}"; executable = "pypy${if isPy3k then "3" else ""}"; - pythonForBuild = self; # Not possible to cross-compile with. sitePackages = "site-packages"; hasDistutilsCxxPatch = false; + + # Not possible to cross-compile with. + pythonOnBuildForBuild = throw "${pname} does not support cross compilation"; + pythonOnBuildForHost = self; + pythonOnBuildForTarget = throw "${pname} does not support cross compilation"; + pythonOnHostForHost = throw "${pname} does not support cross compilation"; + pythonOnTargetForTarget = throw "${pname} does not support cross compilation"; }; pname = "${passthru.executable}_prebuilt"; version = with sourceVersion; "${major}.${minor}.${patch}"; -- cgit 1.4.1