diff options
| author | Artturi <Artturin@artturin.com> | 2023-11-06 03:26:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-06 03:26:22 +0200 |
| commit | 4f649d67d5abd9e8463136fa6b2be50a32b6f64e (patch) | |
| tree | a4c9b8eeae19a362b0dc76d2823f5177a80e0a21 | |
| parent | eecc84500f0dc82f3b8b852a55dff494578766a2 (diff) | |
| parent | 6adef3f43eefd71c96dd9c4f5c1764d02e99808b (diff) | |
| download | nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar.gz nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar.bz2 nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar.lz nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar.xz nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.tar.zst nixpkgs-4f649d67d5abd9e8463136fa6b2be50a32b6f64e.zip | |
Merge pull request #265570 from amjoseph-nixpkgs/pyqtwebengine-take-different-python3
| -rw-r--r-- | pkgs/development/interpreters/python/passthrufun.nix | 7 | ||||
| -rw-r--r-- | pkgs/development/python-modules/pyqtwebengine/default.nix | 2 |
2 files changed, 6 insertions, 3 deletions
diff --git a/pkgs/development/interpreters/python/passthrufun.nix b/pkgs/development/interpreters/python/passthrufun.nix index 867027e3841..6cb906be0a5 100644 --- a/pkgs/development/interpreters/python/passthrufun.nix +++ b/pkgs/development/interpreters/python/passthrufun.nix @@ -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; diff --git a/pkgs/development/python-modules/pyqtwebengine/default.nix b/pkgs/development/python-modules/pyqtwebengine/default.nix index 71abe839a78..9dc076a5e8d 100644 --- a/pkgs/development/python-modules/pyqtwebengine/default.nix +++ b/pkgs/development/python-modules/pyqtwebengine/default.nix @@ -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 |