aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarel Kočí <cynerd@email.cz>2022-04-14 09:47:47 +0200
committerKarel Kočí <cynerd@email.cz>2022-04-14 09:55:41 +0200
commit77b0186c29996be84d4c3f967e2bcf3f63d543a3 (patch)
treecbfdd479eac60db927546184eb49e7cf975b666e
parentc2219a58525f02be455480bbd63c14455345c352 (diff)
downloadnixturris-77b0186c29996be84d4c3f967e2bcf3f63d543a3.tar.gz
nixturris-77b0186c29996be84d4c3f967e2bcf3f63d543a3.tar.bz2
nixturris-77b0186c29996be84d4c3f967e2bcf3f63d543a3.zip
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.
-rw-r--r--README.md2
-rw-r--r--flake.nix14
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}"; }