From 77b0186c29996be84d4c3f967e2bcf3f63d543a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= Date: Thu, 14 Apr 2022 09:47:47 +0200 Subject: flake.nix: make default not cross compile The cross compilation is not exactly working correctly and thus we should perfer the host build but still allow cross compilation. --- README.md | 2 +- flake.nix | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 9b6b6e6..1fb1e55 100644 --- a/README.md +++ b/README.md @@ -63,7 +63,7 @@ should be able to build tarball by navigating to this directory. ``` ~$ nix registry add nixturris git+https://git.cynerd.cz/nixturris -~$ nix build nixturris#tarball-mox +~$ nix build nixturris#tarballMox ``` The last step is to unpack the tarball to the SD card. diff --git a/flake.nix b/flake.nix index 739ba9e..7e52714 100644 --- a/flake.nix +++ b/flake.nix @@ -65,16 +65,16 @@ system: { packages = let - createTarball = board: (self.lib.nixturrisSystem { - system = system; - board = board; - modules = [ (import ./tarball.nix board) ]; - }).config.system.build.tarball; + createTarball = {...} @args: (self.lib.nixturrisSystem ({ + modules = [ (import ./tarball.nix args.board) ]; + } // args)).config.system.build.tarball; in { - tarball-mox = createTarball "mox"; - tarball-omnia = createTarball "omnia"; + tarballMox = createTarball { board = "mox"; }; + tarballOmnia = createTarball { board = "omnia"; }; + crossTarballMox = createTarball { board = "mox"; system = system; }; + crossTarballOmnia = createTarball { board = "omnia"; system = system; }; } // flake-utils.lib.filterPackages system (flake-utils.lib.flattenTree ( import ./pkgs { nixpkgs = nixpkgs-stable.legacyPackages."${system}"; } -- cgit v1.2.3