From 56e2b92633649faaf00672e9fdd333996e438d55 Mon Sep 17 00:00:00 2001 From: Sridhar Ratnakumar Date: Sat, 3 Dec 2022 13:28:55 -0500 Subject: [PATCH] Fix darwin build --- flake.nix | 2 +- nix-darwin/default.nix | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 286c396..f24a034 100644 --- a/flake.nix +++ b/flake.nix @@ -102,7 +102,7 @@ # Configurations for macOS systems (using nix-darwin) darwinConfigurations = { - default = self.lib.mkMacosSystem userName; + default = self.lib-darwin.mkMacosSystem userName; }; }; }; diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix index 5bab6cc..74d7741 100644 --- a/nix-darwin/default.nix +++ b/nix-darwin/default.nix @@ -3,7 +3,7 @@ # Configuration common to all macOS systems flake = { darwinModules = { - common = self.nixosConfig.common; + common = self.nixosModules.common; home.imports = [ inputs.home-manager.darwinModules.home-manager ({ @@ -16,10 +16,12 @@ }) ]; default.imports = - self.darwinModules.common ++ + [ + self.darwinModules.common + ] ++ self.darwinModules.home.imports; }; - mkMacosSystem = userName: inputs.darwin.lib.darwinSystem rec { + lib-darwin.mkMacosSystem = userName: inputs.darwin.lib.darwinSystem rec { system = "aarch64-darwin"; specialArgs = { inherit inputs system;