Skip to content

Commit 88ed729

Browse files
committed
Fix package level component options
1 parent 637a6b8 commit 88ed729

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

overlays/haskell.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -801,7 +801,8 @@ final: prev: {
801801
} // builtins.mapAttrs (_ctype: cs: builtins.mapAttrs (_cname: c: mapOptions c) cs) (builtins.removeAttrs components ["library" "setup"]));
802802
} // builtins.mapAttrs (n: _:
803803
final.lib.mkIf (config.packages ? ${p.pkg-name}) (final.lib.mkOverride (if n == "src" then (if config.packages.${p.pkg-name}.src != null then 90 else 10000) else 995) config.packages.${p.pkg-name}.${n}))
804-
((import ../modules/package-options.nix { inherit haskellLib; inherit (final) lib; }).options // { src = {}; });
804+
((import ../modules/package-options.nix { inherit haskellLib; inherit (final) lib; }).options //
805+
(import ../modules/component-options.nix { inherit haskellLib; inherit (final) lib; }).options // { src = {}; });
805806
}) (final.lib.filter (p: to-key p != p.pkg-name) plan-json.install-plan));
806807
})
807808
({lib, ...}: {

0 commit comments

Comments
 (0)