steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/os: fix devices expressions

Browse source
This commit is contained in:
steveej 2021-01-23 21:29:47 +01:00
parent 288313f70e
commit 4d720297ad
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
nix/os/devices/default.nix
View file

@ -4,8 +4,8 @@
, gitRoot ? "$(git rev-parse --show-toplevel)" , gitRoot ? "$(git rev-parse --show-toplevel)"
# FIXME: why do these need explicit mentioning? # FIXME: why do these need explicit mentioning?
# , moreargs ? "" , moreargs ? ""
# , rebuildarg ? "" , rebuildarg ? ""
, ... , ...
} @ args : } @ args :
@ -44,6 +44,8 @@ in {
recipes = { recipes = {
rebuild = rebuild { rebuild = rebuild {
inherit gitRoot; inherit gitRoot;
inherit moreargs;
inherit rebuildarg;
} }
# // pkgs.lib.attrsets.optionalAttrs (moreargs != "") { inherit moreargs; } # // pkgs.lib.attrsets.optionalAttrs (moreargs != "") { inherit moreargs; }
# // pkgs.lib.attrsets.optionalAttrs (rebuildarg != "") { inherit rebuildarg; } # // pkgs.lib.attrsets.optionalAttrs (rebuildarg != "") { inherit rebuildarg; }