diff options
author | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:24:40 +0200 |
---|---|---|
committer | aszlig <aszlig@redmoonstudios.org> | 2015-04-29 06:24:40 +0200 |
commit | 23a7bc6a7590ebced5828e09c09d6e7a39188d74 (patch) | |
tree | 5e14ae67b83b02df5ef6243e9e99830c24c756d5 /default.nix | |
parent | 4d1787da3fa6bacc8a187fad8a01414011ea1f34 (diff) |
Handle all <nixpkgs> paths with nixpkgs-path.nix.
This file is just defaulting to <nixpkgs>, but we're going to substitue it by the channel generator. We also need to make sure that we don't have any other references to <nixpkgs>, but the latter can best be done on Hydra's side if we don't make <nixpkgs> available to vuizvui builds. Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'default.nix')
-rw-r--r-- | default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/default.nix b/default.nix index c85ef72a..f2ea79e2 100644 --- a/default.nix +++ b/default.nix @@ -1,6 +1,6 @@ { system ? builtins.currentSystem, ... }@args: -with (import <nixpkgs> { inherit system; }).lib; +with (import (import ./nixpkgs-path.nix) { inherit system; }).lib; { machines = mapAttrsRecursiveCond (m: !(m ? build)) (path: attrs: @@ -8,9 +8,9 @@ with (import <nixpkgs> { inherit system; }).lib; ) (import ./machines { inherit system; }); pkgs = import ./pkgs { - pkgs = import <nixpkgs> args; + pkgs = import (import ./nixpkgs-path.nix) args; }; # Inherit upstream lib until we have our own lib. - lib = import <nixpkgs/lib>; + lib = import "${import ./nixpkgs-path.nix}/lib"; } |