diff options
| author | kirillrdy <kirillrdy@gmail.com> | 2024-06-09 09:37:49 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-09 09:37:49 +0000 |
| commit | 41ae060d26123c38f871d88d654eec3ef983f2f6 (patch) | |
| tree | a64a0f96074655be1278c6f5f88889d195c7a935 /pkgs/applications/version-management | |
| parent | 788a1c9eec6eceb815b03826b94ceb3544998b99 (diff) | |
| parent | e2b4425c17ae44f43604a33d7e720897b049cabb (diff) | |
Merge pull request #318182 from rhelmot/freebsd-git-cross
git: add uname_S make flag for freebsd cross
Diffstat (limited to 'pkgs/applications/version-management')
| -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 375908863a2ab..b6d280405b4c3 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 |