From dbbe13a52f33ff340404a3a1f2f2bbb348a675a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Motiejus=20Jak=C5=A1tys?= Date: Sun, 1 Oct 2023 22:29:59 +0300 Subject: [PATCH] flake.nix cosmetics --- flake.nix | 41 +++++++++++++++-------------------------- 1 file changed, 15 insertions(+), 26 deletions(-) diff --git a/flake.nix b/flake.nix index af8112c..a97f123 100644 --- a/flake.nix +++ b/flake.nix @@ -42,32 +42,21 @@ nur, } @ inputs: let myData = import ./data.nix; - pkgsIA64 = import nixpkgs {system = "x86_64-linux";}; - pkgsArm64 = import nixpkgs {system = "aarch64-linux";}; - deployPkgsIA64 = import nixpkgs { - system = "x86_64-linux"; - overlays = [ - deploy-rs.overlay - (_self: super: { - deploy-rs = { - inherit (pkgsIA64) deploy-rs; - lib = super.deploy-rs.lib; - }; - }) - ]; - }; - deployPkgsArm64 = import nixpkgs { - system = "aarch64-linux"; - overlays = [ - deploy-rs.overlay - (_self: super: { - deploy-rs = { - inherit (pkgsArm64) deploy-rs; - lib = super.deploy-rs.lib; - }; - }) - ]; - }; + mkDeployPkgs = system: + import nixpkgs { + system = system; + overlays = [ + deploy-rs.overlay + (_self: super: { + deploy-rs = { + inherit (import nixpkgs {system = system;}) deploy-rs; + lib = super.deploy-rs.lib; + }; + }) + ]; + }; + deployPkgsIA64 = mkDeployPkgs "x86_64-linux"; + deployPkgsArm64 = mkDeployPkgs "aarch64-linux"; in { #nixosConfigurations.vm = nixpkgs.lib.nixosSystem {