roxterm: 2.9.4 -> 3.3.2

Fixes #19579.

+14 -17
+13 -15
pkgs/applications/misc/roxterm/default.nix
··· 1 1 { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext 2 2 , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme 3 3 , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper 4 - , pkgconfig, python, pythonPackages, vte }: 4 + , pkgconfig, python, pythonPackages, vte 5 + , wrapGAppsHook}: 5 6 6 7 # TODO: Still getting following warning. 7 8 # WARNING **: Error retrieving accessibility bus address: org.freedesktop.DBus.Error.ServiceUnknown: The name org.a11y.Bus was not provided by any .service files 8 9 # Seems related to this: 9 10 # https://forums.gentoo.org/viewtopic-t-947210-start-0.html 10 11 11 - let version = "2.9.4"; 12 + let version = "3.3.2"; 12 13 in stdenv.mkDerivation rec { 13 14 name = "roxterm-${version}"; 14 15 15 16 src = fetchurl { 16 - url = "mirror://sourceforge/roxterm/${name}.tar.bz2"; 17 - sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x"; 17 + url = "mirror://sourceforge/roxterm/${name}.tar.xz"; 18 + sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k"; 18 19 }; 20 + 21 + nativeBuildInputs = [ pkgconfig wrapGAppsHook ]; 19 22 20 23 buildInputs = 21 24 [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt 22 - makeWrapper pkgconfig python pythonPackages.lockfile ]; 23 - 24 - propagatedBuildInputs = 25 - [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ]; 25 + makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib 26 + gdk_pixbuf gsettings_desktop_schemas gtk3 27 + hicolor_icon_theme vte ]; 26 28 27 29 NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" 28 30 "-I${dbus_libs.dev}/include/dbus-1.0" ··· 37 39 # Fix up the LD_LIBRARY_PATH so that expat is on it 38 40 export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" 39 41 40 - python mscript.py configure --prefix="$out" 42 + python mscript.py configure --prefix="$out" --disable-nls --disable-translations 41 43 python mscript.py build 42 44 ''; 43 45 44 46 installPhase = '' 45 47 python mscript.py install 46 - 47 - wrapProgram "$out/bin/roxterm" \ 48 - --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" \ 49 - --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" 50 48 ''; 51 49 52 50 meta = with stdenv.lib; { ··· 54 52 license = licenses.gpl3; 55 53 description = "Tabbed, VTE-based terminal emulator"; 56 54 longDescription = '' 57 - Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome. 55 + Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without 56 + the dependencies on Gnome. 58 57 ''; 59 58 maintainers = with maintainers; [ cdepillabout ]; 60 59 platforms = platforms.linux; 61 - broken = true; # https://github.com/NixOS/nixpkgs/issues/19579 62 60 }; 63 61 }
+1 -2
pkgs/top-level/all-packages.nix
··· 15382 15382 15383 15383 roxterm = callPackage ../applications/misc/roxterm { 15384 15384 inherit (pythonPackages) lockfile; 15385 - inherit (gnome3) gsettings_desktop_schemas; 15386 - vte = gnome3.vte_290; 15385 + inherit (gnome3) gsettings_desktop_schemas vte; 15387 15386 }; 15388 15387 15389 15388 xtrace = callPackage ../tools/X11/xtrace { };