Unverified Commit 4f649d67 authored by Artturi's avatar Artturi Committed by GitHub
Browse files

Merge pull request #265570 from amjoseph-nixpkgs/pyqtwebengine-take-different-python3

parents eecc8450 6adef3f4

pkgs/development/interpreters/python/passthrufun.nix

+5 −2
Original line number Diff line number Diff line
@@ -67,6 +67,8 @@ 
      overrides = packageOverrides;

      python = self;

    });

  pythonOnBuildForHost_overridden =

    pythonOnBuildForHost.override { inherit packageOverrides; self = pythonOnBuildForHost_overridden; };

in rec {

    isPy27 = pythonVersion == "2.7";

    isPy37 = pythonVersion == "3.7";
@@ -89,9 +91,10 @@ in rec { 
    pythonAtLeast = lib.versionAtLeast pythonVersion;

    pythonOlder = lib.versionOlder pythonVersion;

    inherit hasDistutilsCxxPatch;

    # TODO: rename to pythonOnBuild

    # TODO: deprecate

    # Not done immediately because its likely used outside Nixpkgs.

    pythonForBuild = pythonOnBuildForHost.override { inherit packageOverrides; self = pythonForBuild; };

    pythonForBuild = pythonOnBuildForHost_overridden;

    pythonOnBuildForHost = pythonOnBuildForHost_overridden;



    tests = callPackage ./tests.nix {

      python = self;

pkgs/development/python-modules/pyqtwebengine/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ in buildPythonPackage (rec { 
  ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [

    sip

  ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [

    buildPackages.python3Packages.sip

    python.pythonOnBuildForHost.pkgs.sip

  ] ++ [

    qtbase

    qtsvg