Skip to content
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

⚡ Add input and remove targetName #33

Merged
merged 1 commit into from
Oct 15, 2024
Merged

⚡ Add input and remove targetName #33

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
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## Added
- `input` parameter to `mkPlatform` for C. This controls what target
gets used for dependent components.

## Removed
- `targetName` no longer gets sent to the `mk*` functions for C.

## [4.1.5] - 2024-09-13

## Fixed
Expand Down
3 changes: 2 additions & 1 deletion c/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ let
, pkgs
, stdenv ? pkgs.stdenv
, output ? name
, input ? output
, platformOverrides ? _: { }
, factoryOverrides ? { }
}@args:
Expand All @@ -45,7 +46,7 @@ let
(import ./make-derivation.nix platformOverrides)
({
inherit base stdenv components;
targetName = output;
targetName = input;
mathjax = mathjax';
} // factoryOverrides);

Expand Down
2 changes: 1 addition & 1 deletion c/make-derivation.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,5 +189,5 @@ in
lib.makeOverridable fn (
builtins.intersectAttrs
(builtins.functionArgs attrsFn)
(pkgs // splicedComponents // { inherit targetName; })
(pkgs // splicedComponents // { inherit stdenv; })
)
Loading