Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
lxterminal: switch to using GTK3
The version of VTE that uses GTK2 is not maintained, so using lxterminal
with GTK2 means dealing with a lot of bugs that have already been fixed
in newer VTE versions. I actually meant to set up lxterminal to use GTK3
in the first place, but didn't realize that wasn't the default until
now.
  • Loading branch information
velovix authored and jtojnar committed Feb 25, 2018
1 parent 2cc5ac2 commit 4b9b82c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions pkgs/applications/misc/lxterminal/default.nix
@@ -1,4 +1,4 @@
{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk2, vte
{ stdenv, fetchurl, automake, autoconf, intltool, pkgconfig, gtk3, vte
, libxslt, docbook_xml_dtd_412, docbook_xml_xslt, libxml2, findXMLCatalogs
}:

Expand All @@ -14,14 +14,15 @@ stdenv.mkDerivation rec {

configureFlags = [
"--enable-man"
"--enable-gtk3"
];

nativeBuildInputs = [
automake autoconf intltool pkgconfig
libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs
];

buildInputs = [ gtk2 vte ];
buildInputs = [ gtk3 vte ];

patches = [
./respect-xml-catalog-files-var.patch
Expand Down
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Expand Up @@ -17612,7 +17612,7 @@ with pkgs;
};

lxterminal = callPackage ../applications/misc/lxterminal {
vte = gnome2.vte;
vte = gnome3.vte;
};

deepin-terminal = callPackage ../applications/misc/deepin-terminal {
Expand Down

0 comments on commit 4b9b82c

Please sign in to comment.