From d8a728c73599d9e3853d1e2e9a16576a438368a7 Mon Sep 17 00:00:00 2001 From: Naxdy Date: Wed, 2 Oct 2024 14:52:31 +0200 Subject: [PATCH] flake: make module & overlay arch-agnostic --- README.md | 2 +- flake.nix | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4122f6074e..b81e591ab8 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,7 @@ Or install it declaratively by adding the following to your `flake.nix` (either } ``` -The Ryujinx flake provides `nixosModules.x86_64-linux.default` and `nixosModules.aarch64-linux.default` which will add the Ryujinx `overlay` (also available standalone via `overlays.default`), providing the `ryujinx` package to your installation, which can then be pulled in as usual, via e.g.: +The Ryujinx flake provides `nixosModules.default` and `nixosModules.default` which will add the Ryujinx `overlay` (also available standalone via `overlays.default`), providing the `ryujinx` package to your installation, which can then be pulled in as usual, via e.g.: ```nix environment.systemPackages = [ diff --git a/flake.nix b/flake.nix index 6d37ce1172..2288763ba8 100644 --- a/flake.nix +++ b/flake.nix @@ -11,22 +11,21 @@ { self , nixpkgs , flake-utils - }: flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: { - + }: (flake-utils.lib.eachSystem [ "x86_64-linux" "aarch64-linux" ] (system: { packages.default = let pkgs = import nixpkgs { inherit system; overlays = [ - self.overlays.${system}.default + self.overlays.default ]; }; in pkgs.ryujinx; - + })) // { nixosModules.default = { config, lib, pkgs, ... }: { nixpkgs.overlays = [ - self.overlays.${system}.default + self.overlays.default ]; }; @@ -35,5 +34,5 @@ src = self; }; }; - }); + }; }