mirror of
https://github.com/NixOS/nixpkgs.git
synced 2025-06-10 19:55:41 +03:00
nixos/pay-respects: fix environment config
Unable to build flake since this was introduced, seems it clobbers other configuration attributes.
This commit is contained in:
parent
0aa475546e
commit
41f6c05504
1 changed files with 14 additions and 11 deletions
|
@ -8,11 +8,11 @@ let
|
|||
inherit (lib)
|
||||
getExe
|
||||
isBool
|
||||
listToAttrs
|
||||
literalExpression
|
||||
maintainers
|
||||
mkEnableOption
|
||||
mkIf
|
||||
mkMerge
|
||||
mkOption
|
||||
mkPackageOption
|
||||
optionalString
|
||||
|
@ -169,16 +169,19 @@ in
|
|||
"url"
|
||||
"model"
|
||||
];
|
||||
environment = mkMerge (
|
||||
[
|
||||
{
|
||||
systemPackages = [ finalPackage ];
|
||||
}
|
||||
]
|
||||
++ map (rule: {
|
||||
etc."xdg/pay-respects/rules/${rule.command}.toml".source = generate "${rule.command}.toml" rule;
|
||||
}) cfg.runtimeRules
|
||||
);
|
||||
|
||||
environment = {
|
||||
etc = listToAttrs (
|
||||
map (rule: {
|
||||
name = "xdg/pay-respects/rules/${rule.command}.toml";
|
||||
value = {
|
||||
source = generate "${rule.command}.toml" rule;
|
||||
};
|
||||
}) cfg.runtimeRules
|
||||
);
|
||||
|
||||
systemPackages = [ finalPackage ];
|
||||
};
|
||||
|
||||
programs = {
|
||||
bash.interactiveShellInit = initScript "bash";
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue