diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-06-09 12:01:06 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 12:01:06 +0000 |
| commit | 668adff0d461761b91d24f755dcd0b52ec83cd5a (patch) | |
| tree | abf0c7f8d779d91525218015822fa23c37138524 /pkgs/applications/version-management/git/default.nix | |
| parent | b45d7259e501e43e6234dc5985a61b379ef46ad9 (diff) | |
| parent | 7cf6063c54d484a6fc9a575b479e368c7116c068 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/version-management/git/default.nix')
| -rw-r--r-- | pkgs/applications/version-management/git/default.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgs/applications/version-management/git/default.nix b/pkgs/applications/version-management/git/default.nix index d7f738adee514..d7e008d656fde 100644 --- a/pkgs/applications/version-management/git/default.nix +++ b/pkgs/applications/version-management/git/default.nix @@ -121,7 +121,8 @@ stdenv.mkDerivation (finalAttrs: { # acceptable version. # # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 - ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent"; + ++ lib.optional stdenv.isDarwin "TKFRAMEWORK=/nonexistent" + ++ lib.optional (stdenv.hostPlatform.isFreeBSD && stdenv.hostPlatform != stdenv.buildPlatform) "uname_S=FreeBSD"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ stdenv.shellPackage |