diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 16:56:51 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 17:36:23 +0100 |
| commit | 6cf25f9dbdef12c36748f322f7414a1d04c8dcd7 (patch) | |
| tree | 6faf7269ade670193404fd6c5b4c5e7ae9ea2cd5 /pkgs/development/interpreters/python/cpython | |
| parent | 8220b0449cffd3c97597aa187b36d05c1257f68b (diff) | |
| download | nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar.gz nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar.bz2 nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar.lz nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar.xz nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.tar.zst nixlib-6cf25f9dbdef12c36748f322f7414a1d04c8dcd7.zip | |
Python: rename parameters and arguments passed to passthru
As part of the splicing the build/host/target combinations of the interpreter need to be passed around internally. The chosen names were not very clear, implying they were package sets whereas actually there were derivations.
Diffstat (limited to 'pkgs/development/interpreters/python/cpython')
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/2.7/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/development/interpreters/python/cpython/default.nix | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix index d7bc50948590..e6ab1f218795 100644 --- a/pkgs/development/interpreters/python/cpython/2.7/default.nix +++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix @@ -50,11 +50,11 @@ let pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; inherit hasDistutilsCxxPatch; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; } // { inherit ucsEncoding; }; diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 5e7668deea39..cd06c2b63670 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -68,11 +68,11 @@ let pythonVersion = with sourceVersion; "${major}.${minor}"; sitePackages = "lib/${libPrefix}/site-packages"; inherit hasDistutilsCxxPatch; - pythonPackagesBuildBuild = pkgsBuildBuild.${pythonAttr}; - pythonPackagesBuildHost = pkgsBuildHost.${pythonAttr}; - pythonPackagesBuildTarget = pkgsBuildTarget.${pythonAttr}; - pythonPackagesHostHost = pkgsHostHost.${pythonAttr}; - pythonPackagesTargetTarget = pkgsTargetTarget.${pythonAttr} or {}; + pythonOnBuildForBuild = pkgsBuildBuild.${pythonAttr}; + pythonOnBuildForHost = pkgsBuildHost.${pythonAttr}; + pythonOnBuildForTarget = pkgsBuildTarget.${pythonAttr}; + pythonOnHostForHost = pkgsHostHost.${pythonAttr}; + pythonOnTargetForTarget = pkgsTargetTarget.${pythonAttr} or {}; }; version = with sourceVersion; "${major}.${minor}.${patch}${suffix}"; |