lol

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

authored by

Artturi and committed by
GitHub
4f649d67 eecc8450

+6 -3
+5 -2
pkgs/development/interpreters/python/passthrufun.nix
··· 67 67 overrides = packageOverrides; 68 68 python = self; 69 69 }); 70 + pythonOnBuildForHost_overridden = 71 + pythonOnBuildForHost.override { inherit packageOverrides; self = pythonOnBuildForHost_overridden; }; 70 72 in rec { 71 73 isPy27 = pythonVersion == "2.7"; 72 74 isPy37 = pythonVersion == "3.7"; ··· 89 91 pythonAtLeast = lib.versionAtLeast pythonVersion; 90 92 pythonOlder = lib.versionOlder pythonVersion; 91 93 inherit hasDistutilsCxxPatch; 92 - # TODO: rename to pythonOnBuild 94 + # TODO: deprecate 93 95 # Not done immediately because its likely used outside Nixpkgs. 94 - pythonForBuild = pythonOnBuildForHost.override { inherit packageOverrides; self = pythonForBuild; }; 96 + pythonForBuild = pythonOnBuildForHost_overridden; 97 + pythonOnBuildForHost = pythonOnBuildForHost_overridden; 95 98 96 99 tests = callPackage ./tests.nix { 97 100 python = self;
+1 -1
pkgs/development/python-modules/pyqtwebengine/default.nix
··· 33 33 ] ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ 34 34 sip 35 35 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ 36 - buildPackages.python3Packages.sip 36 + python.pythonOnBuildForHost.pkgs.sip 37 37 ] ++ [ 38 38 qtbase 39 39 qtsvg