summary refs log tree commit diff
path: root/pkgs/development/interpreters/python
diff options
context:
space:
mode:
authorgithub-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>2021-02-20 12:19:39 +0000
committerGitHub <noreply@github.com>2021-02-20 12:19:39 +0000
commit5884dca2b9d7bc0c505d01e61c270d626f1eb31c (patch)
tree32b0305637009dbdf768841dc7faaa92ca82b911 /pkgs/development/interpreters/python
parent92087cb1701d40d2cd3e167f7fa42fab6fbcd9cc (diff)
parente59a33db58feb4d4c0c58cee6d859a85324110dc (diff)
downloadnixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar.gz
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar.bz2
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar.lz
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar.xz
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.tar.zst
nixpkgs-5884dca2b9d7bc0c505d01e61c270d626f1eb31c.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/development/interpreters/python')
-rw-r--r--pkgs/development/interpreters/python/pypy/prebuilt.nix11
1 files changed, 9 insertions, 2 deletions
diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index f301fd15f09..460af1cc67b 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
@@ -31,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}";