Skip to content

python3Packages.wrapPython: use pkgsBuildTarget.makeWrapper by default #481907

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
doronbehar wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

python3Packages.wrapPython: use pkgsBuildTarget.makeWrapper by default #481907

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05f2df9
python3Packages.wrapPython: use pkgsBuildTarget.makeWrapper by default
doronbehar Jan 19, 2026
e67dcb4
pkgsStatic.apple-sdk: enable bootstrap to avoid circular dependency w…
doronbehar Jan 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions pkgs/by-name/ap/apple-sdk/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,12 @@ in
darwinSdkMajorVersion ? lib.versions.major stdenv.hostPlatform.darwinSdkVersion,

# Enabling bootstrap disables propagation. Defaults to `false` (meaning to propagate certain packages and `xcrun`)
# except in stage0 of the Darwin stdenv bootstrap.
enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin",
# except in stage0 of the Darwin stdenv bootstrap or when building static to avoid circular dependencies.
# For static builds, propagating libiconv creates this cycle:
# apple-sdk-static → libiconv-static → mkAppleDerivation (adds meson to nativeBuildInputs)
# → meson → python3.pkgs.buildPythonApplication → wrapPython → pkgsBuildTarget.makeWrapper
# → targetPackages.runtimeShell → bash-static → stdenv-darwin-static → apple-sdk-static
enableBootstrap ? stdenv.name == "bootstrap-stage0-stdenv-darwin" || stdenv.hostPlatform.isStatic,

# Required by various phases
callPackage,
Expand Down
5 changes: 1 addition & 4 deletions pkgs/by-name/ya/yaml-merge/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
stdenv,
fetchFromGitHub,
python3Packages,
pkgsHostTarget,
}:

stdenv.mkDerivation {
Expand All @@ -19,9 +18,7 @@ stdenv.mkDerivation {

pythonPath = with python3Packages; [ pyyaml ];
nativeBuildInputs = [
# Not `python3Packages.wrapPython` to workaround `python3Packages.wrapPython.__spliced.buildHost` having the wrong `pythonHost`
# See https://github.com/NixOS/nixpkgs/issues/434307
pkgsHostTarget.python3Packages.wrapPython
python3Packages.wrapPython
];

installPhase = ''
Expand Down
4 changes: 1 addition & 3 deletions pkgs/development/interpreters/python/hooks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -473,9 +473,7 @@ in
} ./wheel-unpack-hook.sh
) { };

wrapPython = callPackage ../wrap-python.nix {
inherit (pkgs.buildPackages) makeWrapper;
};
wrapPython = callPackage ../wrap-python.nix { };

sphinxHook = callPackage (
{ makePythonHook, installShellFiles }:
Expand Down
4 changes: 2 additions & 2 deletions pkgs/development/interpreters/python/wrap-python.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
lib,
python,
makePythonHook,
makeWrapper,
pkgsBuildTarget,
}:

makePythonHook {
name = "wrap-python-hook";
propagatedBuildInputs = [ makeWrapper ];
propagatedBuildInputs = [ pkgsBuildTarget.makeWrapper ];
substitutions.sitePackages = python.sitePackages;
substitutions.executable = python.interpreter;
substitutions.python = python.pythonOnBuildForHost;
Expand Down
Loading