diff options
| -rw-r--r-- | lib/maintainers.nix | 1 | ||||
| -rw-r--r-- | pkgs/applications/misc/lxterminal/default.nix | 46 | ||||
| -rw-r--r-- | pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch | 15 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
4 files changed, 66 insertions, 0 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 1cac557b495..f4af4fe366b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -695,6 +695,7 @@ vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>"; vcunat = "Vladimír Čunát <vcunat@gmail.com>"; vdemeester = "Vincent Demeester <vincent@sbr.pm>"; + velovix = "Tyler Compton <xaviosx@gmail.com>"; veprbl = "Dmitry Kalinkin <veprbl@gmail.com>"; vidbina = "David Asabina <vid@bina.me>"; vifino = "Adrian Pistol <vifino@tty.sh>"; diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix new file mode 100644 index 00000000000..145672cad38 --- /dev/null +++ b/pkgs/applications/misc/lxterminal/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte +, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs +}: + +let version = "0.3.1"; in + +stdenv.mkDerivation rec { + name = "lxterminal-${version}"; + + src = fetchurl { + url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; + sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; + }; + + configureFlags = [ + "--enable-man" + ]; + + buildInputs = [ + automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 + docbook_xml_xslt libxml2 findXMLCatalogs + ]; + + patches = [ + ./respect-xml-catalog-files-var.patch + ]; + + preConfigure = '' + ./autogen.sh + ''; + + doCheck = true; + + meta = { + description = "The standard terminal emulator of LXDE"; + longDescription = '' + LXTerminal is the standard terminal emulator of LXDE. The terminal is a + desktop-independent VTE-based terminal emulator for LXDE without any + unnecessary dependencies. + ''; + homepage = https://wiki.lxde.org/en/LXTerminal; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.velovix ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch new file mode 100644 index 00000000000..598f506118f --- /dev/null +++ b/pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch @@ -0,0 +1,15 @@ +diff --git a/acinclude.m4 b/acinclude.m4 +index be626c5..b449b1b 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + [ + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) +- if $jh_found_xmlcatalog && \ +- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then ++ # empty argument forces libxml to use XML_CATALOG_FILES variable ++ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then + AC_MSG_RESULT([found]) + ifelse([$3],,,[$3 + ])dnl diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e602c00e26..47834e94855 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17120,6 +17120,10 @@ with pkgs; vte = gnome2.vte.override { pythonSupport = true; }; }; + lxterminal = callPackage ../applications/misc/lxterminal { + vte = gnome2.vte; + }; + deepin-terminal = callPackage ../applications/misc/deepin-terminal { inherit (gnome3) libgee vte; wnck = libwnck3; |