Skip to content

rust-overlay: Fix cross-compilation #347

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

Open
mildsunrise wants to merge 2 commits into
base: master
Choose a base branch
from
Open

rust-overlay: Fix cross-compilation #347

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e865984
rust-overlay: use right platform for components/extensions lookup
mildsunrise Nov 29, 2025
05ebb2e
rust-overlay: add targetPlatform to targets, NOT hostTargets
mildsunrise Nov 29, 2025
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
10 changes: 6 additions & 4 deletions rust-overlay.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ let
getComponentsWithFixedPlatform = pkgs: pkgname: stdenv:
let
pkg = pkgs.${pkgname};
srcInfo = pkg.target.${toRustTargetCompat stdenv.targetPlatform} or pkg.target."*";
srcInfo = pkg.target.${toRustTargetCompat stdenv.hostPlatform} or pkg.target."*";
components = srcInfo.components or [];
componentNamesList =
builtins.map (pkg: pkg.pkg) (builtins.filter (pkg: (pkg.target != "*")) components);
Expand All @@ -78,7 +78,7 @@ let
let
inherit (super.lib) unique;
pkg = pkgs.${pkgname};
srcInfo = pkg.target.${toRustTargetCompat stdenv.targetPlatform} or pkg.target."*";
srcInfo = pkg.target.${toRustTargetCompat stdenv.hostPlatform} or pkg.target."*";
extensions = srcInfo.extensions or [];
extensionNamesList = unique (builtins.map (pkg: pkg.pkg) extensions);
in
Expand Down Expand Up @@ -127,13 +127,15 @@ let
in
extensionsToInstall;

getComponents = pkgs: pkgname: targets: extensions: targetExtensions: stdenv: fetchurl:
getComponents = pkgs: pkgname: extraTargets: extensions: targetExtensions: stdenv: fetchurl:
let
inherit (builtins) head map;
inherit (super.lib) flatten remove subtractLists unique;
targetExtensionsToInstall = checkMissingExtensions pkgs pkgname stdenv targetExtensions;
extensionsToInstall = checkMissingExtensions pkgs pkgname stdenv extensions;
hostTargets = [ "*" (toRustTargetCompat stdenv.hostPlatform) (toRustTargetCompat stdenv.targetPlatform) ];
hostTargets = [ "*" (toRustTargetCompat stdenv.hostPlatform) ];
implicitTargets = subtractLists hostTargets [ (toRustTargetCompat stdenv.targetPlatform) ];
targets = unique (extraTargets ++ implicitTargets);
pkgTuples = flatten (getTargetPkgTuples pkgs pkgname hostTargets targets stdenv);
extensionTuples = flatten (map (name: getTargetPkgTuples pkgs name hostTargets targets stdenv) extensionsToInstall);
targetExtensionTuples = flatten (map (name: getTargetPkgTuples pkgs name targets targets stdenv) targetExtensionsToInstall);
Expand Down