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

This commit is contained in:
Artturi
2023-11-06 03:26:22 +02:00
committed by GitHub
2 changed files with 6 additions and 3 deletions
@@ -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;
@@ -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