From 482566b84fc9b30538ae4dd090e77a0979aa1a3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Sun, 17 Jul 2022 19:35:04 +0200
Subject: nixos: allow tarball build and cross-build directly

---
 lib/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'lib')

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));
-
 }
-- 
cgit v1.2.3