From 3fe1c81060819b82b08f5f297089400a1c67252d Mon Sep 17 00:00:00 2001
From: Franz Pletz <fpletz@fnordicwalking.de>
Date: Sat, 19 Nov 2016 18:57:02 +0100
Subject: roxterm: 2.9.4 -> 3.3.2

Fixes #19579.
---
 pkgs/applications/misc/roxterm/default.nix | 28 +++++++++++++---------------
 pkgs/top-level/all-packages.nix            |  3 +--
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix
index d07863df0e0d..cbf602b75dab 100644
--- a/pkgs/applications/misc/roxterm/default.nix
+++ b/pkgs/applications/misc/roxterm/default.nix
@@ -1,28 +1,30 @@
 { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
 , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
 , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
-, pkgconfig, python, pythonPackages, vte }:
+, pkgconfig, python, pythonPackages, vte
+, wrapGAppsHook}:
 
 # TODO: Still getting following warning.
 # WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files
 # Seems related to this:
 # https://forums.gentoo.org/viewtopic-t-947210-start-0.html
 
-let version = "2.9.4";
+let version = "3.3.2";
 in stdenv.mkDerivation rec {
   name = "roxterm-${version}";
 
   src = fetchurl {
-    url = "mirror://sourceforge/roxterm/${name}.tar.bz2";
-    sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
+    url = "mirror://sourceforge/roxterm/${name}.tar.xz";
+    sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
   };
 
+  nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
+
   buildInputs =
     [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
-      makeWrapper pkgconfig python pythonPackages.lockfile ];
-
-  propagatedBuildInputs =
-    [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
+      makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib
+      gdk_pixbuf gsettings_desktop_schemas gtk3
+      hicolor_icon_theme vte ];
 
   NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
                          "-I${dbus_libs.dev}/include/dbus-1.0"
@@ -37,16 +39,12 @@ in stdenv.mkDerivation rec {
     # Fix up the LD_LIBRARY_PATH so that expat is on it
     export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib"
 
-    python mscript.py configure --prefix="$out"
+    python mscript.py configure --prefix="$out" --disable-nls --disable-translations
     python mscript.py build
   '';
 
   installPhase = ''
     python mscript.py install
-
-    wrapProgram "$out/bin/roxterm" \
-        --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \
-        --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE"
   '';
 
   meta = with stdenv.lib; {
@@ -54,10 +52,10 @@ in stdenv.mkDerivation rec {
     license = licenses.gpl3;
     description = "Tabbed, VTE-based terminal emulator";
     longDescription = ''
-      Tabbed, VTE-based terminal emulator.  Similar to gnome-terminal without the dependencies on Gnome.
+      Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without
+      the dependencies on Gnome.
     '';
     maintainers = with maintainers; [ cdepillabout ];
     platforms = platforms.linux;
-    broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4f7663e6d9e0..5f0077018461 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15382,8 +15382,7 @@ in
 
   roxterm = callPackage ../applications/misc/roxterm {
     inherit (pythonPackages) lockfile;
-    inherit (gnome3) gsettings_desktop_schemas;
-    vte = gnome3.vte_290;
+    inherit (gnome3) gsettings_desktop_schemas vte;
   };
 
   xtrace = callPackage ../tools/X11/xtrace { };
-- 
cgit 1.4.1