ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 20:34:52 +03:00
Code Issues Projects Releases Wiki Activity

roxterm: 2.9.4 -> 3.3.2

Browse Source 
Fixes #19579.
This commit is contained in:
Franz Pletz 2016-11-19 18:57:02 +01:00
parent eca9955b83
commit 3fe1c81060
No known key found for this signature in database
GPG Key ID: 846FDED7792617B4
2 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/applications/misc/roxterm/default.nix
View File

@ -1,28 +1,30 @@
{ stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext { stdenv, fetchurl, docbook_xsl, dbus_libs, dbus_glib, expat, gettext
, gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme , gsettings_desktop_schemas, gdk_pixbuf, gtk2, gtk3, hicolor_icon_theme
, imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper , imagemagick, itstool, librsvg, libtool, libxslt, lockfile, makeWrapper
, pkgconfig, python, pythonPackages, vte }: , pkgconfig, python, pythonPackages, vte
, wrapGAppsHook}:
# TODO: Still getting following warning. # 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 # 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: # Seems related to this:
# https://forums.gentoo.org/viewtopic-t-947210-start-0.html # https://forums.gentoo.org/viewtopic-t-947210-start-0.html
let version = "2.9.4"; let version = "3.3.2";
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
name = "roxterm-${version}"; name = "roxterm-${version}";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/roxterm/${name}.tar.bz2"; url = "mirror://sourceforge/roxterm/${name}.tar.xz";
sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x"; sha256 = "0vjh7k4jm4bd01j88w9bmvq27zqsajjzy131fpi81zkii5lisl1k";
}; };
nativeBuildInputs = [ pkgconfig wrapGAppsHook ];
buildInputs = buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper pkgconfig python pythonPackages.lockfile ]; makeWrapper python pythonPackages.lockfile dbus_libs dbus_glib
gdk_pixbuf gsettings_desktop_schemas gtk3
propagatedBuildInputs = hicolor_icon_theme vte ];
[ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0" NIX_CFLAGS_COMPILE = [ "-I${dbus_glib.dev}/include/dbus-1.0"
"-I${dbus_libs.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 # Fix up the LD_LIBRARY_PATH so that expat is on it
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat.out}/lib" 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 python mscript.py build
''; '';
installPhase = '' installPhase = ''
python mscript.py install 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; { meta = with stdenv.lib; {
@ -54,10 +52,10 @@ in stdenv.mkDerivation rec {
license = licenses.gpl3; license = licenses.gpl3;
description = "Tabbed, VTE-based terminal emulator"; description = "Tabbed, VTE-based terminal emulator";
longDescription = '' 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 ]; maintainers = with maintainers; [ cdepillabout ];
platforms = platforms.linux; platforms = platforms.linux;
broken = true; # https://github.com/NixOS/nixpkgs/issues/19579
}; };
} }

3
pkgs/top-level/all-packages.nix
View File

@ -15382,8 +15382,7 @@ in
roxterm = callPackage ../applications/misc/roxterm { roxterm = callPackage ../applications/misc/roxterm {
inherit (pythonPackages) lockfile; inherit (pythonPackages) lockfile;
inherit (gnome3) gsettings_desktop_schemas; inherit (gnome3) gsettings_desktop_schemas vte;
vte = gnome3.vte_290;
}; };
xtrace = callPackage ../tools/X11/xtrace { }; xtrace = callPackage ../tools/X11/xtrace { };