diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-02-08 14:30:24 +0100 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-02-08 14:33:34 +0100 |
commit | fcf2866023abcf971f9aa21a795cb6fef57627b5 (patch) | |
tree | 798a8715399bf0d06f8029d6f93535338c51eee3 /default.nix | |
parent | e01247cb10c8fdf4b36db609b3f2b80303a28ac8 (diff) |
lib/call-machine: Introduce .build shortcut
The shortcut is mainly to make things a bit easier, instead of: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.eval.config.system.build.toplevel We can now do something like this: nix-build '<vuizvui/machines>' \ -A aszlig.tishtushi.build ... in order to get a system store path out of a machine definition. This also fixes an evaluation error in the top-level default.nix. Thanks to @Profpatsch for bringing this to my attention. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/default.nix b/default.nix index f2ea79e2..a6ac9441 100644 --- a/default.nix +++ b/default.nix @@ -3,9 +3,10 @@ with (import (import ./nixpkgs-path.nix) { inherit system; }).lib; { - machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: - attrs.build.config.system.build.toplevel - ) (import ./machines { inherit system; }); + machines = let + getBuild = const (getAttr "build"); + allMachines = import ./machines { inherit system; }; + in mapAttrsRecursiveCond (m: !(m ? eval)) getBuild allMachines; pkgs = import ./pkgs { pkgs = import (import ./nixpkgs-path.nix) args; |