diff options
author | aszlig <aszlig@redmoonstudios.org> | 2016-05-16 23:06:21 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2016-05-16 23:06:21 +0200 |
commit | 677bcd924099b1f01a2a9bc29f62112c720ee760 (patch) | |
tree | 241020e2ffa7e85c889823723f5d496086f282a0 /default.nix | |
parent | 6cf4f9c146900077be88d76168711c22a6442df5 (diff) |
default.nix: Clean up and preperly name space lib
We want to have lib.vuizvui instead of polluting the <nixpkgs/lib> namespace with our functions. Apart from that the default.nix was broken because of 49dc58c, which factored away the argument from <vuizvui/machines>. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/default.nix b/default.nix index d821b75e..86e58376 100644 --- a/default.nix +++ b/default.nix @@ -1,15 +1,13 @@ { system ? builtins.currentSystem, ... }@args: -with (import (import ./nixpkgs-path.nix) { inherit system; }).lib; - { - machines = import ./machines { - inherit system; - }; + machines = import ./machines; pkgs = import ./pkgs { pkgs = import (import ./nixpkgs-path.nix) args; }; - lib = import "${import ./nixpkgs-path.nix}/lib" // import ./lib; + lib = import "${import ./nixpkgs-path.nix}/lib" // { + vuizvui = import ./lib; + }; } |