From ee72cdb050021d296143f459f7206d96c6355c78 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Tue, 22 Oct 2019 18:38:42 +0000 Subject: git: drop extraneous sysconfdir trailing slash I noticed while strace-ing that Git was trying to open /etc//gitconfig. Not a big deal, but it is definitely more correct without the trailing slash. --- .../pkgs/applications/version-management/git-and-tools/git/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'nixpkgs/pkgs/applications/version-management/git-and-tools') diff --git a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 47da7f7a1d7f..dac6723f31ce 100644 --- a/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation { ++ (if perlSupport then ["PERL_PATH=${perlPackages.perl}/bin/perl"] else ["NO_PERL=1"]) ++ (if pythonSupport then ["PYTHON_PATH=${python}/bin/python"] else ["NO_PYTHON=1"]) ++ stdenv.lib.optionals stdenv.isSunOS ["INSTALL=install" "NO_INET_NTOP=" "NO_INET_PTON="] - ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc/"]) + ++ (if stdenv.isDarwin then ["NO_APPLE_COMMON_CRYPTO=1"] else ["sysconfdir=/etc"]) ++ stdenv.lib.optionals stdenv.hostPlatform.isMusl ["NO_SYS_POLL_H=1" "NO_GETTEXT=YesPlease"] ++ stdenv.lib.optional withpcre2 "USE_LIBPCRE2=1"; -- cgit 1.4.1