From fcc4fce7d0cc9fcb84da9173391944bb6d1e2e96 Mon Sep 17 00:00:00 2001 From: Andrew Childs Date: Sun, 15 Nov 2020 02:32:52 +0900 Subject: [PATCH] git: fix darwin build (#103774) The install step for the darwin specific $out/etc/gitconfig file assumed that $out/etc already existed. This assumption is no longer true after f5e2ff1ed80dac74bfb0afa92f34641cce098a49 in #103421. This change makes make sure the directory exists before adding to it. (cherry picked from commit d686ded08ce6b38dbb8316c46f505907a2a2a3ad) --- .../version-management/git-and-tools/git/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 1cb78811e72f..b59da3b8c1b0 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -255,6 +255,7 @@ stdenv.mkDerivation { '') + stdenv.lib.optionalString stdenv.isDarwin '' # enable git-credential-osxkeychain by default if darwin + mkdir -p $out/etc cat > $out/etc/gitconfig << EOF [credential] helper = osxkeychain