Merge pull request #126468 from marsam/update-tmux

tmux: 3.2 -> 3.2a
This commit is contained in:
Maximilian Bosch 2021-06-10 19:03:22 +02:00 committed by GitHub
commit ef8e4bdea0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,6 +1,5 @@
{ lib, stdenv { lib, stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, autoreconfHook , autoreconfHook
, pkg-config , pkg-config
, bison , bison
@ -21,7 +20,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "tmux"; pname = "tmux";
version = "3.2"; version = "3.2a";
outputs = [ "out" "man" ]; outputs = [ "out" "man" ];
@ -29,18 +28,9 @@ stdenv.mkDerivation rec {
owner = "tmux"; owner = "tmux";
repo = "tmux"; repo = "tmux";
rev = version; rev = version;
sha256 = "0alq81h1rz1f0zsy8qb2dvsl47axpa86j4bplngwkph0ksqqgr3p"; sha256 = "0143ylfk7zsl3xmiasb768238gr582cfhsgv3p0h0f13bp8d6q09";
}; };
patches = [
# Fix cross-compilation
# https://github.com/tmux/tmux/pull/2651
(fetchpatch {
url = "https://github.com/tmux/tmux/commit/bb6242675ad0c7447daef148fffced882e5b4a61.patch";
sha256 = "1acr3xv3gqpq7qa2f8hw7c4f42hi444lfm1bz6wqj8f3yi320zjr";
})
];
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config
autoreconfHook autoreconfHook