From 94fc7214ce2396e488ed17918a9824d2c39db144 Mon Sep 17 00:00:00 2001 From: Dan Peebles Date: Wed, 8 Nov 2017 22:23:07 -0500 Subject: git: remove custom sandbox profile (not allowed by modern Nix anymore) --- pkgs/applications/version-management/git-and-tools/git/default.nix | 3 --- 1 file changed, 3 deletions(-) (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix') 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 6358a340bb6e..5e42992cbe22 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -53,9 +53,6 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.cc.isClang) "-lgcc_s" + stdenv.lib.optionalString (stdenv.isFreeBSD) "-lthr"; - # without this, git fails when trying to check for /etc/gitconfig existence - propagatedSandboxProfile = stdenv.lib.sandbox.allowDirectoryList "/etc"; - makeFlags = "prefix=\${out} PERL_PATH=${perl}/bin/perl SHELL_PATH=${stdenv.shell} " + (if pythonSupport then "PYTHON_PATH=${python}/bin/python" else "NO_PYTHON=1") + (if stdenv.isSunOS then " INSTALL=install NO_INET_NTOP= NO_INET_PTON=" else "") -- cgit 1.4.1