Commit 0443b98a authored by sternenseemann's avatar sternenseemann
Browse files

buildPython*: unconditionally add .override 

To be able to splice, we can't fail to eval before returning an
attribute set. By checking for f ? override, we need to force f which
isn't always possible, whereas mirrorFunctionArgs serves as an
indirection which wraps the inner thunks in an attribute set that can
always be returned. Fortunately, there should be no case when f
evaluates successfully and does not have the override attribute, so we
can just remove the condition.

This fixes evaluation of buildPython* based packages in certain splicing
situations by being lazier. An example of this is
pkgsCross.ghcjs.buildPackages.nixpkgs-openjdk-updater on staging right
now (ff5098e3).
parent 81a37420

pkgs/development/interpreters/python/python-packages-base.nix

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ let 
      else

        result

    )

    // lib.optionalAttrs (f ? override) {

    // {

      # Support overriding `f` itself, e.g. `buildPythonPackage.override { }`.

      # Ensure `makeOverridablePythonPackage` is applied to the result.

      override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));