git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #61572 from dtzWill/update/termite-15

termite: 15, minor patch follow-up

commit54b50ba5c39e275687467ab0fcdf3466f2150be7 authorSilvan Mosberger <infinisil@icloud.com> dateThu 16 May 2019, 20:56 (8 years ago) parentef148214757f0e
1 file changed+10−4
pkgs/applications/misc/termite/default.nix+10−4
pkgs/applications/misc/termite/default.nix+10−4
@@ -1,20 +1,26 @@
1−{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
1+{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
22
33stdenv.mkDerivation rec {
44 name = "termite-${version}";
5− version = "14";
5+ version = "15";
66
77 src = fetchFromGitHub {
88 owner = "thestinger";
99 repo = "termite";
1010 rev = "v${version}";
11− sha256 = "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x";
11+ sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k";
1212 fetchSubmodules = true;
1313 };
1414
1515 # https://github.com/thestinger/termite/pull/516
1616 patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch
17− ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
17+ # Fix off-by-one in select_text() on libvte >= 0.55.0
18+ # Expected to be included in next release (16).
19+ (fetchpatch {
20+ url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch";
21+ sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j";
22+ })
23+ ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch;
1824
1925 makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
2026