diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2024-06-14 17:56:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-06-14 17:56:08 +0200 |
| commit | 554ca5edece41b4de4cb3b365e539bbd7abf6162 (patch) | |
| tree | 803bf43c7c0d91179b639d709ec2bbdd32120580 /pkgs/tools | |
| parent | a14abce5354c60254ec75e7d93853a0c759b9045 (diff) | |
| parent | f92e6e80b5db9267887f56cef3ae8b8720511f5c (diff) | |
Merge pull request #318178 from rhelmot/freebsd-tmux
tmux: add upstream patch to fix FreeBSD build
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/misc/tmux/default.nix | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 913310ec7a471..dec0e1b453359 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -38,10 +38,17 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-RX3RZ0Mcyda7C7im1r4QgUxTnp95nfpGgQ2HRxr0s64="; }; - patches = [(fetchpatch { - url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; - hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; - })]; + patches = [ + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/2d1afa0e62a24aa7c53ce4fb6f1e35e29d01a904.diff"; + hash = "sha256-mDt5wy570qrUc0clGa3GhZFTKgL0sfnQcWJEJBKAbKs="; + }) + # this patch is designed for android but FreeBSD exhibits the same error for the same reason + (fetchpatch { + url = "https://github.com/tmux/tmux/commit/4f5a944ae3e8f7a230054b6c0b26f423fa738e71.patch"; + hash = "sha256-HlUeU5ZicPe7Ya8A1HpunxfVOE2BF6jOHq3ZqTuU5RE="; + }) + ]; nativeBuildInputs = [ pkg-config |