diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 17:06:08 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-11-28 17:36:23 +0100 |
commit | 5804c8a7f5f0db0ebefb4aa612cc7a254debd57a (patch) | |
tree | da477e84be9a24d66b70604612273451d92f225a /pkgs/development/interpreters | |
parent | 6cf25f9dbdef12c36748f322f7414a1d04c8dcd7 (diff) | |
download | nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar.gz nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar.bz2 nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar.lz nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar.xz nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.tar.zst nixpkgs-5804c8a7f5f0db0ebefb4aa612cc7a254debd57a.zip |
Python splicing: splice package sets, not Python derivation
In the original commit the various builds of Python were added to `otherSplices`, instead of the intended Python package sets.
Diffstat (limited to 'pkgs/development/interpreters')
-rw-r--r-- | pkgs/development/interpreters/python/default.nix | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix index 91a464ea463..e98cb89b77d 100644 --- a/pkgs/development/interpreters/python/default.nix +++ b/pkgs/development/interpreters/python/default.nix @@ -28,11 +28,11 @@ with pkgs; python = self; }; otherSplices = { - selfBuildBuild = pythonOnBuildForBuild; - selfBuildHost = pythonOnBuildForHost; - selfBuildTarget = pythonOnBuildForTarget; - selfHostHost = pythonOnHostForHost; - selfTargetTarget = pythonOnTargetForTarget; + selfBuildBuild = pythonOnBuildForBuild.pkgs; + selfBuildHost = pythonOnBuildForHost.pkgs; + selfBuildTarget = pythonOnBuildForTarget.pkgs; + selfHostHost = pythonOnHostForHost.pkgs; + selfTargetTarget = pythonOnTargetForTarget.pkgs or {}; # There is no Python TargetTarget. }; keep = self: { # TODO maybe only define these here so nothing is needed to be kept in sync. |