Commit 64214826 authored by Doron Behar's avatar Doron Behar
Browse files

python3: let lib.mkScopeWithSplicing do its job 



Fixes #476822 and #480467 . By itself this change doesn't trigger many
rebuilds, but it is easier to justify it in conjunction with the
previous commit.

Co-Authored-By: default avatarColin <colin@uninsane.org>
parent fbe78254

pkgs/development/interpreters/python/cpython/default.nix

+3 −9
Original line number Diff line number Diff line
@@ -152,8 +152,6 @@ let 


  passthru =

    let

      # When we override the interpreter we also need to override the spliced versions of the interpreter

      inputs' = lib.filterAttrs (n: v: n != "passthruFun" && !lib.isDerivation v) inputs;

      # Memoization of the splices to avoid re-evaluating this function for all combinations of splices e.g.

      # python3.pythonOnBuildForHost.pythonOnBuildForTarget == python3.pythonOnBuildForTarget by consuming

      # __splices as an arg and using the cache if populated.
@@ -170,13 +168,9 @@ let 
      override =

        attr:

        let

          python = attr.override (

            inputs'

            // {

          python = attr.override {

            self = python;

              __splices = splices;

            }

          );

          };

        in

        python;

    in