dot013/nix
1
0
Fork 0
Code Issues Pull Requests Activity

fix(devkit): paths being overriden instead of appended

Browse Source
This commit is contained in:
Guz
2025-02-12 20:31:46 -03:00
parent 6210ec6cc9
commit c87b164c3c
7 changed files with 45 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
packages/devkit/git/default.nix
View File

@@ -4,7 +4,6 @@
pkgs,
lib,
git ? pkgs.git,
paths ? [],
}: let
drv = symlinkJoin ({
paths = git;
@@ -12,24 +11,22 @@
nativeBuildInputs = [makeWrapper];
postBuild = ''
wrapProgram $out/bin/git ${
if (builtins.length paths) > 0
then "$PATH:${lib.makeBinPath paths}"
else ""
} \
--set-default 'GIT_CONFIG_COUNT' 6 \
--set-default 'GIT_CONFIG_KEY_0' 'core.pager' \
--set-default 'GIT_CONFIG_VALUE_0' '${lib.getExe pkgs.delta}' \
--set-default 'GIT_CONFIG_KEY_1' 'credentials.helper' \
--set-default 'GIT_CONFIG_VALUE_1' 'store' \
--set-default 'GIT_CONFIG_KEY_2' 'interactive.diffFilter' \
--set-default 'GIT_CONFIG_VALUE_2' '${lib.getExe pkgs.delta} --color-only' \
--set-default 'GIT_CONFIG_KEY_3' 'signing.signByDefault' \
--set-default 'GIT_CONFIG_VALUE_3' 'true' \
--set-default 'GIT_CONFIG_KEY_4' 'user.email' \
--set-default 'GIT_CONFIG_VALUE_4' 'contact@guz.one' \
--set-default 'GIT_CONFIG_KEY_5' 'user.name' \
--set-default 'GIT_CONFIG_VALUE_5' 'Gustavo "Guz" L de Mello'
wrapProgram $out/bin/git \
--set-default 'GIT_CONFIG_COUNT' 7 \
--set-default 'GIT_CONFIG_KEY_0' 'core.pager' \
--set-default 'GIT_CONFIG_VALUE_0' '${lib.getExe pkgs.delta}' \
--set-default 'GIT_CONFIG_KEY_1' 'credentials.helper' \
--set-default 'GIT_CONFIG_VALUE_1' 'store' \
--set-default 'GIT_CONFIG_KEY_2' 'interactive.diffFilter' \
--set-default 'GIT_CONFIG_VALUE_2' '${lib.getExe pkgs.delta} --color-only' \
--set-default 'GIT_CONFIG_KEY_3' 'signing.signByDefault' \
--set-default 'GIT_CONFIG_VALUE_3' 'true' \
--set-default 'GIT_CONFIG_KEY_4' 'user.email' \
--set-default 'GIT_CONFIG_VALUE_4' 'contact@guz.one' \
--set-default 'GIT_CONFIG_KEY_5' 'user.name' \
--set-default 'GIT_CONFIG_VALUE_5' 'Gustavo "Guz" L de Mello' \
--set-default 'GIT_CONFIG_KEY_6' 'commit.gpgsign' \
--set-default 'GIT_CONFIG_VALUE_6' 'true'
'';
}
// {inherit (git) name pname meta;});