diff options
author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-19 18:57:02 +0100 |
---|---|---|
committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-11-20 04:48:44 +0100 |
commit | 3fe1c81060819b82b08f5f297089400a1c67252d (patch) | |
tree | 9092a8af211e798de68147f42ac8a9bf62eb3689 /pkgs/applications/misc/roxterm | |
parent | eca9955b8302efce3b12b0bc5aa117e38c8315bd (diff) | |
download | nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar.gz nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar.bz2 nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar.lz nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar.xz nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.tar.zst nixpkgs-3fe1c81060819b82b08f5f297089400a1c67252d.zip |
roxterm: 2.9.4 -> 3.3.2
Fixes #19579.
Diffstat (limited to 'pkgs/applications/misc/roxterm')
-rw-r--r-- | pkgs/applications/misc/roxterm/default.nix | 28 |
1 files changed, 13 insertions, 15 deletions
diff --git a/pkgs/applications/misc/roxterm/default.nix b/pkgs/applications/misc/roxterm/default.nix index d07863df0e0..cbf602b75da 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 }; } |