From cfe083ec2f88860e0520ddbd6874aa6981e38e8a Mon Sep 17 00:00:00 2001 From: Brian Picciano Date: Sat, 11 May 2024 18:12:46 +0200 Subject: Set ssh env and make sure all git utilities are available, so that git over ssh works --- default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'default.nix') diff --git a/default.nix b/default.nix index 112444d..ebe9b92 100644 --- a/default.nix +++ b/default.nix @@ -44,8 +44,7 @@ in rec { }; - git = pkgs.writeScriptBin "git" '' - #!${pkgs.bash}/bin/bash + gitWrapped = pkgs.writeShellScript "git" '' export XDG_CONFIG_HOME=${gitConfig} bin="${pkgs.git}/bin/git" @@ -60,6 +59,12 @@ in rec { exec "$bin" "$@" ''; + git = pkgs.runCommand "mediocregopher-git" {} '' + cp -rL "${pkgs.git}" "$out" + chmod -R +rwX "$out" + cp "${gitWrapped}" "$out"/bin/git + ''; + bin = pkgs.buildEnv { name = "mediocregopher-bin"; paths = [ -- cgit v1.2.3