diff options
author | Tyler Compton <xaviosx@gmail.com> | 2018-02-24 16:49:15 -0700 |
---|---|---|
committer | Jan Tojnar <jtojnar@gmail.com> | 2018-02-25 12:46:10 +0100 |
commit | 4b9b82c038de4ef2ecb570c7027b98fecb76bde0 (patch) | |
tree | cecb135516eb4e29b4aae73dcd535b2035c30f38 | |
parent | 2cc5ac2299ab14f6763c0a8f63b4c2e5c1998f7b (diff) | |
download | nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar.gz nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar.bz2 nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar.lz nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar.xz nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.tar.zst nixpkgs-4b9b82c038de4ef2ecb570c7027b98fecb76bde0.zip |
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.
-rw-r--r-- | pkgs/applications/misc/lxterminal/default.nix | 5 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pkgs/applications/misc/lxterminal/default.nix b/pkgs/applications/misc/lxterminal/default.nix index a514b0ff63d..0a2a051223a 100644 --- a/pkgs/applications/misc/lxterminal/default.nix +++ b/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 }: @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-man" + "--enable-gtk3" ]; nativeBuildInputs = [ @@ -21,7 +22,7 @@ stdenv.mkDerivation rec { libxslt docbook_xml_dtd_412 docbook_xml_xslt libxml2 findXMLCatalogs ]; - buildInputs = [ gtk2 vte ]; + buildInputs = [ gtk3 vte ]; patches = [ ./respect-xml-catalog-files-var.patch diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cdc888fba43..f5563685c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17612,7 +17612,7 @@ with pkgs; }; lxterminal = callPackage ../applications/misc/lxterminal { - vte = gnome2.vte; + vte = gnome3.vte; }; deepin-terminal = callPackage ../applications/misc/deepin-terminal { |