Skip to content

Take a broken nixpkgs behaviour re overriding Python interpreter into account #420

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

Closed
adisbladis wants to merge 1 commit into from
Closed

Take a broken nixpkgs behaviour re overriding Python interpreter into account #420

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
22 changes: 18 additions & 4 deletions build/hooks/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,16 +17,30 @@
} // replacements),
}:
let
# Set with fallback for old nixpkgs compat
pythonOnBuildForHost = python.pythonOnBuildForHost or python.pythonForBuild;
isCross = stdenv.buildPlatform != stdenv.hostPlatform;
pythonOnBuildForHost =
# Take a broken nixpkgs behaviour re overriding Python interpreter into account.
#
# When overriding the Python interpreter pre
# https://github.com/NixOS/nixpkgs/commit/64214826833482bb3b4fd89b77aabf1248abe33b
# all non-derivation values were passed down to the various Python interpreter variants (such as pythonOnBuildForHost) too.
#
# We can work around this broken behaviour for native builds by only considering the one overriden Python attribute, ignoring it's sub-variants.
# This also has the advantage of possibly using less memory as we don't have to instantiate the same derivation yet again.
#
# Cross compiled Python's would require a nixpkgs fix to propagate it's overriden settings to the build variants,
# but for cross it's also not very likely to matter as the build Python isn't what you normally care about customising.
if isCross then (
# fallback for old (22.11+) nixpkgs compat
python.pythonOnBuildForHost or python.pythonForBuild
)
else python;

inherit (builtins) functionArgs;

inherit (pkgs) buildPackages;
pythonSitePackages = python.sitePackages;

isCross = stdenv.buildPlatform != stdenv.hostPlatform;

# When cross compiling create a virtual environment for the build.
#
# Because Nixpkgs builds cross compiled Python in a separate
Expand Down
Loading