JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vte-ng: move inside termite

Browse Source 
It is just a few patches only needed by termite. Let's not pollute our tree with it.
This commit is contained in:
Jan Tojnar 2019-09-29 01:30:15 +02:00
parent 880fab10fc
commit b8ab8598ed
No known key found for this signature in database
GPG Key ID: 7FAB2A15F7A607A4
4 changed files with 38 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkgs/applications/misc/termite/default.nix
View File

@ -1,6 +1,40 @@
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }:
{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte, gtk3, ncurses, pcre2, wrapGAppsHook }:
stdenv.mkDerivation rec {
let
# termite requires VTE with some internals exposed
# https://github.com/thestinger/vte-ng
vte-ng = vte.overrideAttrs (attrs: {
patches = attrs.patches or [] ++ [
(fetchpatch {
name = "0001-expose-functions-for-pausing-unpausing-output.patch";
url = "https://github.com/thestinger/vte-ng/commit/342e26574f50dcd40bbeaad9e839c2a6144d0c1c.patch";
sha256 = "1b0k9ys545q85vfki417p21kis9f36yd0hyp12phayynss6fn715";
})
(fetchpatch {
name = "0002-expose-function-for-setting-cursor-position.patch";
url = "https://github.com/thestinger/vte-ng/commit/5ae3acb69474fe5bc43767a4a3625e9ed23607a1.patch";
sha256 = "091sb44g2pl0zbxnxidpfmsqqc65dmkakhjb0wvlnsjckqalhs89";
})
(fetchpatch {
name = "0003-add-function-for-setting-the-text-selections.patch";
url = "https://github.com/thestinger/vte-ng/commit/742d57ecf15e24f6a5f2133a81b6c70acc8ff03c.patch";
sha256 = "12rq3svbj1nzridbssxsvmmb8njky3w8qdnkymz7850b3kqg277x";
})
(fetchpatch {
name = "0004-add-functions-to-get-set-block-selection-mode.patch";
url = "https://github.com/thestinger/vte-ng/commit/08748fd9cb82bd191e5c476b1682ca71f7732572.patch";
sha256 = "1cnhd8f7ywdgcyd6xmcd2nn39jjxzkxp4d0zsj2k7m5v74nhcs1g";
})
(fetchpatch {
name = "0005-expose-function-for-getting-the-selected-text.patch";
url = "https://github.com/thestinger/vte-ng/commit/dd74ae7c06e8888af2fc090ac6f8920a9d8227fb.patch";
sha256 = "0pbnbkwqxm4p9xsgvqwayvh8srk5z1kyjnigmahf9mlqn7hi6v27";
})
];
});
in stdenv.mkDerivation rec {
pname = "termite";
version = "15";
@ -24,7 +58,7 @@ stdenv.mkDerivation rec {
makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ];
buildInputs = [ vte-ng gtk3 ncurses ];
buildInputs = [ vte-ng gtk3 ncurses pcre2 ];
nativeBuildInputs = [ wrapGAppsHook pkgconfig ];

2
pkgs/desktops/gnome-3/default.nix
View File

@ -338,7 +338,7 @@ lib.makeScope pkgs.newScope (self: with self; {
inherit (pkgs) atk glib gobject-introspection gspell webkitgtk gtk3 gtkmm3
libgtop libgudev libhttpseverywhere librsvg libsecret gdk_pixbuf gtksourceview gtksourceviewmm gtksourceview4
easytag meld orca rhythmbox shotwell gnome-usage
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 vte-ng gnome-menus gdl;
clutter clutter-gst clutter-gtk cogl gtk-vnc libdazzle libgda libgit2-glib libgxps libgdata libgepub libcroco libpeas libgee geocode-glib libgweather librest libzapojit libmediaart gfbgraph gexiv2 folks totem-pl-parser gcr gsound libgnomekbd vte vte_290 gnome-menus gdl;
inherit (pkgs) gsettings-desktop-schemas; # added 2019-04-16
inherit (pkgs) gnome-video-effects; # added 2019-08-19
inherit (pkgs) gnome-online-accounts grilo grilo-plugins tracker tracker-miners gnome-photos; # added 2019-08-23

59
pkgs/development/libraries/vte/ng.nix
View File

@ -1,59 +0,0 @@
{ vte, fetchFromGitHub, fetchpatch, autoconf, automake, gtk-doc, gettext, libtool, gperf
, stdenv, fetchurl, intltool, pkgconfig
, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
, pcre2
}:
stdenv.mkDerivation rec {
name = "vte-ng-${version}";
version = "0.54.2.a";
src = fetchFromGitHub {
owner = "thestinger";
repo = "vte-ng";
rev = version;
sha256 = "1r7d9m07cpdr4f7rw3yx33hmp4jmsk0dn5byq5wgksb2qjbc4ags";
};
patches = [
# Fix build with vala 0.44
# See: https://github.com/thestinger/vte-ng/issues/32
(fetchpatch {
url = "https://gitlab.gnome.org/GNOME/vte/commit/53690d5cee51bdb7c3f7680d3c22b316b1086f2c.patch";
sha256 = "1jrpqsx5hqa01g7cfqrsns6vz51mwyqwdp43ifcpkhz3wlp5dy66";
})
];
nativeBuildInputs = [
gtk-doc autoconf automake gettext libtool gperf
gobject-introspection intltool pkgconfig vala gperf libxml2
];
buildInputs = [ glib gtk3 ncurses ];
propagatedBuildInputs = [
# Required by vte-2.91.pc.
gtk3
gnutls
pcre2
];
preConfigure = "patchShebangs .; NOCONFIGURE=1 ./autogen.sh";
configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
meta = with stdenv.lib; {
homepage = https://www.gnome.org/;
description = "A library implementing a terminal emulator widget for GTK";
longDescription = ''
VTE is a library (libvte) implementing a terminal emulator widget for
GTK, and a minimal sample application (vte) using that. Vte is
mainly used in gnome-terminal, but can also be used to embed a
console/terminal in games, editors, IDEs, etc. VTE supports Unicode and
character set conversion, as well as emulating any terminal known to
the system's terminfo database.
'';
license = licenses.lgpl2;
maintainers = with maintainers; [ astsmtl antono lethalman ];
platforms = platforms.unix;
};
}

2
pkgs/top-level/all-packages.nix
View File

@ -14035,8 +14035,6 @@ in
vte_290 = callPackage ../development/libraries/vte/2.90.nix { };
vte-ng = callPackage ../development/libraries/vte/ng.nix { };
vtk = callPackage ../development/libraries/vtk {
inherit (darwin) libobjc;
inherit (darwin.apple_sdk.libs) xpc;