diff options
author | Karel Kočí <cynerd@email.cz> | 2022-07-17 19:35:04 +0200 |
---|---|---|
committer | Karel Kočí <cynerd@email.cz> | 2022-07-17 19:35:04 +0200 |
commit | 482566b84fc9b30538ae4dd090e77a0979aa1a3f (patch) | |
tree | 16a9819851b9fda2fcf45698c38f6b63eeb58228 /lib | |
parent | b106528fd8db5f1004b5559b742c2f2825e39940 (diff) | |
download | nixturris-482566b84fc9b30538ae4dd090e77a0979aa1a3f.tar.gz nixturris-482566b84fc9b30538ae4dd090e77a0979aa1a3f.tar.bz2 nixturris-482566b84fc9b30538ae4dd090e77a0979aa1a3f.zip |
nixos: allow tarball build and cross-build directly
Diffstat (limited to 'lib')
-rw-r--r-- | lib/default.nix | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/lib/default.nix b/lib/default.nix index 211451e..1136741 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -16,18 +16,13 @@ nixturrisSystem = { board, nixpkgs ? nixpkgsDefault, - system ? boardSystem.${board}.system, modules ? [], override ? {} }: nixpkgs.lib.nixosSystem ({ - system = system; + system = boardSystem.${board}.system; modules = [ self.nixosModules.default - ({ - turris.board = board; - } // nixpkgs.lib.optionalAttrs (system != boardSystem.${board}.system) { - nixpkgs.crossSystem = boardSystem.${board}; - }) + { turris.board = board; } ] ++ modules; } // override); @@ -45,8 +40,4 @@ }; }); - nixturrisTarballSystem = {...} @args: (nixturrisSystem ({ - modules = [ (import ../tarball.nix args.board) ]; - } // args)); - } |