diff options
| author | Will Dietz <w@wdtz.org> | 2019-05-15 18:45:08 -0500 |
|---|---|---|
| committer | Will Dietz <w@wdtz.org> | 2019-05-15 21:29:55 -0500 |
| commit | 4757f0e7cf8484927b65ffa9fe751efffa9c8959 (patch) | |
| tree | c671b232f16ab3ebcb379682ea622683dfe24788 /pkgs/applications | |
| parent | 11a7e02e583c919897996e6cabb3e25a9322ec6c (diff) | |
| download | nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar.gz nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar.bz2 nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar.lz nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar.xz nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.tar.zst nixpkgs-4757f0e7cf8484927b65ffa9fe751efffa9c8959.zip | |
termite: pick upstream fix for off-by-one w/newer vte
Diffstat (limited to 'pkgs/applications')
| -rw-r--r-- | pkgs/applications/misc/termite/default.nix | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 1a02d4837fe..674b228746d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -14,7 +14,13 @@ stdenv.mkDerivation rec { # https://github.com/thestinger/termite/pull/516 patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + # Fix off-by-one in select_text() on libvte >= 0.55.0 + # Expected to be included in next release (16). + (fetchpatch { + url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; + sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; |