From b6ce12e424e629aad59a06a975f4c318500336b1 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Mon, 25 Apr 2022 16:00:17 -0400 Subject: [PATCH] Handle x86 macbooks as well --- nix/darwin/flake.nix | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/nix/darwin/flake.nix b/nix/darwin/flake.nix index 415c084..562e988 100644 --- a/nix/darwin/flake.nix +++ b/nix/darwin/flake.nix @@ -15,21 +15,25 @@ outputs = {self, nixpkgs, darwin, runwhen, durnitisp, rust-overlay, ...}: let - system = "aarch64-darwin"; - pkgs = import nixpkgs { inherit system; }; + forSystem = (system: + let + pkgs = import nixpkgs { inherit system; }; + in + darwin.lib.darwinSystem rec { + inherit system; + modules = [ + ./darwin-configuration.nix + ]; + inputs = { + runwhen = runwhen.defaultPackage."${system}"; + durnitisp = durnitisp.defaultPackage."${system}"; + rust-overlay = rust-overlay.overlay; + buildah = pkgs.buildah; + }; + }); in - { - darwinConfigurations."jeremys-mbp" = darwin.lib.darwinSystem rec { - inherit system; - modules = [ - ./darwin-configuration.nix - ]; - inputs = { - runwhen = runwhen.defaultPackage."${system}"; - durnitisp = durnitisp.defaultPackage."${system}"; - rust-overlay = rust-overlay.overlay; - buildah = pkgs.buildah; - }; - }; + { + darwinConfigurations."jeremys-mbp" = forSystem "aarch64-darwin"; + darwinConfigurations."jeremys-mbpx86" = forSystem "x86_64-darwin"; }; }