diff options
| author | Dan Peebles <pumpkin@me.com> | 2017-11-08 22:23:07 -0500 |
|---|---|---|
| committer | Dan Peebles <pumpkin@me.com> | 2017-11-08 22:23:07 -0500 |
| commit | 94fc7214ce2396e488ed17918a9824d2c39db144 (patch) | |
| tree | 94ac9e8dc96e4f48e99b8b60380289c7c06350bb /pkgs/applications/version-management/git-and-tools/git/default.nix | |
| parent | 0f75e6bef7ddfd89dd62e87fbe2a8ee34d1aba8f (diff) | |
| download | nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar.gz nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar.bz2 nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar.lz nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar.xz nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.tar.zst nixlib-94fc7214ce2396e488ed17918a9824d2c39db144.zip | |
git: remove custom sandbox profile (not allowed by modern Nix anymore)
Diffstat (limited to 'pkgs/applications/version-management/git-and-tools/git/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git-and-tools/git/default.nix | 3 |
1 files changed, 0 insertions, 3 deletions
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 "") |