Merge commit '2d2f10475138b7206572dc3ec288184df2be022e'

3 files changed, 110 insertions, 0 deletions

diff --git a/nixpkgs/pkgs/development/libraries/vte/2.90.nix b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
new file mode 100644
index 000000000000..4b2b74c5e1d5
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/vte/2.90.nix
@@ -0,0 +1,41 @@
+{ stdenv, fetchurl, intltool, pkgconfig, gnome3, glib, gtk3, ncurses, gobject-introspection }:
+
+stdenv.mkDerivation rec {
+  versionMajor = "0.36";
+  versionMinor = "3";
+  moduleName   = "vte";
+
+  name = "${moduleName}-${versionMajor}.${versionMinor}";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz";
+    sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c";
+  };
+
+  nativeBuildInputs = [ pkgconfig ];
+  buildInputs = [ gobject-introspection intltool glib gtk3 ncurses ];
+
+  configureFlags = [ "--enable-introspection" ];
+
+  enableParallelBuilding = true;
+
+  postInstall = ''
+    substituteInPlace $out/lib/libvte2_90.la --replace "-lncurses" "-L${ncurses.out}/lib -lncurses"
+  '';
+
+  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.linux;
+  };
+}
diff --git a/nixpkgs/pkgs/development/libraries/vte/default.nix b/nixpkgs/pkgs/development/libraries/vte/default.nix
new file mode 100644
index 000000000000..97bb961c4bc5
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/vte/default.nix
@@ -0,0 +1,51 @@
+{ stdenv, fetchurl, intltool, pkgconfig
+, gnome3, glib, gtk3, ncurses, gobject-introspection, vala, libxml2, gnutls
+, gperf, pcre2
+}:
+
+stdenv.mkDerivation rec {
+  pname = "vte";
+  version = "0.54.3";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/${pname}/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
+    sha256 = "1zgb8jgi6sr4km58zfml8zkm24qipbngl2h7s5razhi5a0a84dk9";
+  };
+
+  passthru = {
+    updateScript = gnome3.updateScript { packageName = pname; };
+  };
+
+  nativeBuildInputs = [ gobject-introspection intltool pkgconfig vala gperf libxml2 ];
+  buildInputs = [ glib gtk3 ncurses ];
+
+  propagatedBuildInputs = [
+    # Required by vte-2.91.pc.
+    gtk3
+    gnutls
+    pcre2
+  ];
+
+  preConfigure = "patchShebangs .";
+
+  configureFlags = [ "--enable-introspection" "--disable-Bsymbolic" ];
+
+  enableParallelBuilding = true;
+
+  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.linux ++ platforms.darwin;
+  };
+}
+
diff --git a/nixpkgs/pkgs/development/libraries/vte/ng.nix b/nixpkgs/pkgs/development/libraries/vte/ng.nix
new file mode 100644
index 000000000000..3aee9e9dcdf3
--- /dev/null
+++ b/nixpkgs/pkgs/development/libraries/vte/ng.nix
@@ -0,0 +1,18 @@
+{ vte, fetchFromGitHub, autoconf, automake, gtk-doc, gettext, libtool, gperf }:
+
+vte.overrideAttrs (oldAttrs: rec {
+  name = "vte-ng-${version}";
+  version = "0.50.2.a";
+
+  src = fetchFromGitHub {
+    owner = "thestinger";
+    repo = "vte-ng";
+    rev = version;
+    sha256 = "0i6hfzw9sq8521kz0l7lld2km56r0bfp1hw6kxq3j1msb8z8svcf";
+  };
+
+  preConfigure = oldAttrs.preConfigure + "; NOCONFIGURE=1 ./autogen.sh";
+
+  nativeBuildInputs = oldAttrs.nativeBuildInputs or []
+    ++ [ gtk-doc autoconf automake gettext libtool gperf ];
+})