diff --git a/CHANGELOG.md b/CHANGELOG.md index 1130c2f..444d055 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## Fixed - Overriding the factory of a C platform caused the 'override' function to disappear from the resulting set. +- `output` now works as expected on C platforms. Previously, setting + output to a different value than `name` created a broken + configuration. ## [4.1.4] - 2024-06-03 diff --git a/c/default.nix b/c/default.nix index 2074804..1b7ddd5 100644 --- a/c/default.nix +++ b/c/default.nix @@ -36,14 +36,14 @@ let { name , pkgs , stdenv ? pkgs.stdenv - , output ? null + , output ? name , platformOverrides ? _: { } }@args: let factory = pkgs.callPackage (import ./make-derivation.nix platformOverrides) { inherit base stdenv components; - targetName = name; + targetName = output; mathjax = mathjax'; }; @@ -55,7 +55,7 @@ let mkPlatform (args // overrides); overrideFactory = overrides: finalPlatform (factory.override overrides); - } // lib.optionalAttrs (output != null) { inherit output; }; + } // { inherit output; }; in finalPlatform factory; @@ -69,7 +69,7 @@ let createPlatformTargets = attrsOrFn: lib.mapAttrs' (name: platform: { - name = platform.output or name; + name = platform.output; value = platform attrsOrFn; }) platforms';