lol

Merge pull request #33240 from velovix/master

lxterminal: init at 0.3.1

authored by

John Ericson and committed by
GitHub
1ecebbd9 310ad434

+66
+1
lib/maintainers.nix
··· 695 695 vbmithr = "Vincent Bernardoff <vb@luminar.eu.org>"; 696 696 vcunat = "Vladimír Čunát <vcunat@gmail.com>"; 697 697 vdemeester = "Vincent Demeester <vincent@sbr.pm>"; 698 + velovix = "Tyler Compton <xaviosx@gmail.com>"; 698 699 veprbl = "Dmitry Kalinkin <veprbl@gmail.com>"; 699 700 vidbina = "David Asabina <vid@bina.me>"; 700 701 vifino = "Adrian Pistol <vifino@tty.sh>";
+46
pkgs/applications/misc/lxterminal/default.nix
··· 1 + { stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte 2 + , libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs 3 + }: 4 + 5 + let version = "0.3.1"; in 6 + 7 + stdenv.mkDerivation rec { 8 + name = "lxterminal-${version}"; 9 + 10 + src = fetchurl { 11 + url = "https://github.com/lxde/lxterminal/archive/${version}.tar.gz"; 12 + sha256 = "e91f15c8a726d5c13227263476583137a2639d4799c021ca0726c9805021b54c"; 13 + }; 14 + 15 + configureFlags = [ 16 + "--enable-man" 17 + ]; 18 + 19 + buildInputs = [ 20 + automake autoconf intltool pkgconfig gtk2 vte libxslt docbook_xml_dtd_412 21 + docbook_xml_xslt libxml2 findXMLCatalogs 22 + ]; 23 + 24 + patches = [ 25 + ./respect-xml-catalog-files-var.patch 26 + ]; 27 + 28 + preConfigure = '' 29 + ./autogen.sh 30 + ''; 31 + 32 + doCheck = true; 33 + 34 + meta = { 35 + description = "The standard terminal emulator of LXDE"; 36 + longDescription = '' 37 + LXTerminal is the standard terminal emulator of LXDE. The terminal is a 38 + desktop-independent VTE-based terminal emulator for LXDE without any 39 + unnecessary dependencies. 40 + ''; 41 + homepage = https://wiki.lxde.org/en/LXTerminal; 42 + license = stdenv.lib.licenses.gpl2; 43 + maintainers = [ stdenv.lib.maintainers.velovix ]; 44 + platforms = stdenv.lib.platforms.linux; 45 + }; 46 + }
+15
pkgs/applications/misc/lxterminal/respect-xml-catalog-files-var.patch
··· 1 + diff --git a/acinclude.m4 b/acinclude.m4 2 + index be626c5..b449b1b 100644 3 + --- a/acinclude.m4 4 + +++ b/acinclude.m4 5 + @@ -40,8 +40,8 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], 6 + [ 7 + AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl 8 + AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) 9 + - if $jh_found_xmlcatalog && \ 10 + - AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then 11 + + # empty argument forces libxml to use XML_CATALOG_FILES variable 12 + + if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then 13 + AC_MSG_RESULT([found]) 14 + ifelse([$3],,,[$3 15 + ])dnl
+4
pkgs/top-level/all-packages.nix
··· 17120 17120 vte = gnome2.vte.override { pythonSupport = true; }; 17121 17121 }; 17122 17122 17123 + lxterminal = callPackage ../applications/misc/lxterminal { 17124 + vte = gnome2.vte; 17125 + }; 17126 + 17123 17127 deepin-terminal = callPackage ../applications/misc/deepin-terminal { 17124 17128 inherit (gnome3) libgee vte; 17125 17129 wnck = libwnck3;