From 5086b2cae080b8d7536eb7608a9948133240104a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikodem=20Rabuli=C5=84ski?= Date: Wed, 25 Sep 2024 23:29:14 +0200 Subject: [PATCH] treewide: fix darwin, remove obsolete follow --- flake.nix | 1 - hosts/default.nix | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 29f5b63..8074a55 100644 --- a/flake.nix +++ b/flake.nix @@ -116,7 +116,6 @@ }; crane = { url = "github:ipetkov/crane"; - inputs.nixpkgs.follows = "nixpkgs"; }; firefox-darwin = { url = "github:bandithedoge/nixpkgs-firefox-darwin"; diff --git a/hosts/default.nix b/hosts/default.nix index 3f2395c..e6a4005 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -66,9 +66,15 @@ darwin = name: module: - baseDarwin._module.args.extendModules { - modules = [ module ]; - specialArgs.configurationName = name; + let + eval = baseDarwin._module.args.extendModules { + modules = [ module ]; + specialArgs.configurationName = name; + }; + in + eval + // { + system = eval.config.system.build.toplevel; }; }; }