Skip to content

mk-aggregated: overridable stdenv #216

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
szlend wants to merge 1 commit into
base: master
Choose a base branch
from
+9 −5
Draft

mk-aggregated: overridable stdenv #216

Show file tree
Hide file tree
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
10 changes: 6 additions & 4 deletions lib/mk-aggregated.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
{ lib, stdenv, symlinkJoin, pkgsTargetTarget, bash, curl, rustc }:
{ pname, version, date, selectedComponents, availableComponents ? selectedComponents }:
{ lib, stdenv, symlinkJoin, pkgsHostTarget, pkgsTargetTarget, bash, curl, rustc }:
{ pname, version, date, stdenvSelector, selectedComponents, availableComponents ? selectedComponents}:
let
inherit (lib) optional;
inherit (stdenv) targetPlatform;
stdenvHostTarget = stdenvSelector pkgsHostTarget;
stdenvTargetTarget = stdenvSelector pkgsTargetTarget;
in
symlinkJoin {
name = pname + "-" + version;
Expand All @@ -29,13 +31,13 @@ symlinkJoin {

# CC for build script linking.
# Workaround: should be `pkgsHostHost.cc` but `stdenv`'s cc itself have -1 offset.
depsHostHostPropagated = [ stdenv.cc ];
depsHostHostPropagated = [ stdenvHostTarget.cc ];

# CC for crate linking.
# Workaround: should be `pkgsHostTarget.cc` but `stdenv`'s cc itself have -1 offset.
# N.B. WASM targets don't need our CC.
propagatedBuildInputs =
optional (!targetPlatform.isWasm) pkgsTargetTarget.stdenv.cc;
optional (!targetPlatform.isWasm) stdenvTargetTarget.cc;

# Link dependency for target, required by darwin std.
depsTargetTargetPropagated =
Expand Down
4 changes: 3 additions & 1 deletion lib/rust-bin.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,10 +289,11 @@ let
) allPlatformSet;

mkProfile = name: profileComponents:
makeOverridable ({ extensions, targets, targetExtensions }:
makeOverridable ({ extensions, targets, targetExtensions, stdenvSelector }:
mkAggregated {
pname = "rust-${name}";
inherit (manifest) version date;
inherit stdenvSelector;
availableComponents = componentSet.${rustHostPlatform};
selectedComponents = resolveComponents {
name = "rust-${name}-${manifest.version}";
Expand All @@ -309,6 +310,7 @@ let
extensions = [];
targets = [];
targetExtensions = [];
stdenvSelector = pkgs: pkgs.stdenv;
};

profiles = mapAttrs mkProfile manifest.profiles;
Expand Down
⚡