Merge pull request #33240 from velovix/master

lxterminal: init at 0.3.1

Changed files
+66
lib
pkgs
applications
top-level
+1
lib/maintainers.nix
···
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>";
+46
pkgs/applications/misc/lxterminal/default.nix
···
+
{ 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;
+
};
+
}
+15
pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
···
+
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
+4
pkgs/top-level/all-packages.nix
···
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;