diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-27 16:24:42 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 16:36:03 +0100 |
| commit | cce2fd547be73f6a709d86751b67e9ae798f5d46 (patch) | |
| tree | cbce5d51741cca5fd167f40d9c320f7007b56806 /pkgs/development/interpreters/python/pypy/default.nix | |
| parent | be36f6f0a0ffbeef228a021f5a343f5ce7a183de (diff) | |
Python: use pythonPackagesBuildHost instead of pythonForBuild
Follow-up to #104201, related to #105113.
Diffstat (limited to 'pkgs/development/interpreters/python/pypy/default.nix')
| -rw-r--r-- | pkgs/development/interpreters/python/pypy/default.nix | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix index 0647ce878642..b941750eb4e5 100644 --- a/pkgs/development/interpreters/python/pypy/default.nix +++ b/pkgs/development/interpreters/python/pypy/default.nix @@ -5,10 +5,16 @@ , python-setup-hook # For the Python package set , packageOverrides ? (self: super: {}) +, pkgsBuildBuild +, pkgsBuildHost +, pkgsBuildTarget +, pkgsHostHost +, pkgsTargetTarget , sourceVersion , pythonVersion , sha256 , passthruFun +, pythonAttr ? "pypy${stdenv.lib.substring 0 1 pythonVersion}${stdenv.lib.substring 2 3 pythonVersion}" }: assert zlibSupport -> zlib != null; @@ -25,12 +31,11 @@ let sitePackages = "site-packages"; hasDistutilsCxxPatch = false; - # No cross-compiling for now. - pythonForBuild = self; - pythonPackagesBuildBuild = {}; - pythonPackagesBuildTarget = {}; - pythonPackagesHostHost = {}; - pythonPackagesTargetTarget = {}; + pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; + pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; + pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; + pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; + pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; }; pname = passthru.executable; version = with sourceVersion; "${major}.${minor}.${patch}"; |