From 41b1af808f1de69c31f3fd164d5274154ee782e4 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 4 Sep 2020 20:01:19 +0200 Subject: targets.darwin: disable application directory This disables the generation of the application directory until conflicting behavior with nix-darwin is resolved. See https://github.com/rycee/home-manager/issues/1341#issuecomment-687286866 --- modules/targets/darwin.nix | 4 +++- tests/modules/targets-darwin/default.nix | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/targets/darwin.nix b/modules/targets/darwin.nix index 0d434234bbb..cd7d8e289cf 100644 --- a/modules/targets/darwin.nix +++ b/modules/targets/darwin.nix @@ -1,7 +1,9 @@ { config, lib, pkgs, ... }: { - config = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin { + # Disabled for now due to conflicting behavior with nix-darwin. See + # https://github.com/rycee/home-manager/issues/1341#issuecomment-687286866 + config = lib.mkIf (false && pkgs.stdenv.hostPlatform.isDarwin) { # Install MacOS applications to the user environment. home.file."Applications/Home Manager Apps".source = let apps = pkgs.buildEnv { diff --git a/tests/modules/targets-darwin/default.nix b/tests/modules/targets-darwin/default.nix index 479f586eef3..5c04854ff2e 100644 --- a/tests/modules/targets-darwin/default.nix +++ b/tests/modules/targets-darwin/default.nix @@ -1 +1,5 @@ -{ targets-darwin = ./darwin.nix; } +{ + # Disabled for now due to conflicting behavior with nix-darwin. See + # https://github.com/rycee/home-manager/issues/1341#issuecomment-687286866 + #targets-darwin = ./darwin.nix; +} -- cgit v1.2.3