JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Took out builder script for default builder.

Browse Source 
Removed the builder script in order to use the default builder based on
comments from a code review.
This commit is contained in:
(cdep)illabout 2014-09-19 17:08:37 +02:00
parent 62e4bf2716
commit e52caabe63
3 changed files with 35 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
pkgs/applications/misc/roxterm/builder.sh
View File

@ -1,23 +0,0 @@
# Fix up python path so the lockfile library is on it.
# TODO: This probably shouldn't hardcode python2.7.
for path in $pythonPath; do
echo $path
PYTHONPATH="${PYTHONPATH}${path}/lib/python2.7/site-packages:"
done
export PYTHONPATH
# Fix up the LD_LIBRARY_PATH so that expat is on it
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$ldLibraryPath"
source $stdenv/setup
unpackPhase
cd "$name"
python mscript.py configure --prefix="$out"
python mscript.py build
python mscript.py install
wrapProgram "$out/bin/roxterm" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"

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

@ -1,42 +1,59 @@
{ 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, pythonFull, pythonPackages, vte }:
{ 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, pythonFull, pythonPackages, vte }:
# TODO: Still getting following warning:
# Gtk-WARNING **: Error loading icon from file '/nix/store/36haql12nc3c91jqf0w8nz29zrwxd2gl-roxterm-2.9.4/share/icons/hicolor/scalable/apps/roxterm.svg':
# Couldn't recognize the image file format for file '/nix/store/36haql12nc3c91jqf0w8nz29zrwxd2gl-roxterm-2.9.4/share/icons/hicolor/scalable/apps/roxterm.svg'
stdenv.mkDerivation rec {
versionMajor = "2.9";
versionMinor = "4";
name = "roxterm-${versionMajor}.${versionMinor}";
let version = "2.9.4";
in stdenv.mkDerivation rec {
name = "roxterm-${version}";
src = fetchurl {
url = "http://downloads.sourceforge.net/roxterm/${name}.tar.bz2";
sha256 = "0djfiwfmnqqp6930kswzr2rss0mh40vglcdybwpxrijcw4n8j21x";
};
buildInputs = [ docbook_xsl expat imagemagick itstool librsvg libtool libxslt makeWrapper pkgconfig pythonFull pythonPackages.lockfile ];
buildInputs =
[ docbook_xsl expat imagemagick itstool librsvg libtool libxslt
makeWrapper pkgconfig pythonFull pythonPackages.lockfile ];
propagatedBuildInputs = [ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
propagatedBuildInputs =
[ dbus_libs dbus_glib gdk_pixbuf gettext gsettings_desktop_schemas gtk2 gtk3 hicolor_icon_theme vte ];
NIX_CFLAGS_COMPILE = [ "-I${dbus_glib}/include/dbus-1.0"
"-I${dbus_libs}/include/dbus-1.0"
"-I${dbus_libs}/lib/dbus-1.0/include" ];
ldLibraryPath = "${expat}/lib"; # ugly hack for xgettext to work during build
# Fix up python path so the lockfile library is on it.
PYTHONPATH = stdenv.lib.makeSearchPath "lib/${pythonFull.python.libPrefix}/site-packages" [
pythonPackages.curses pythonPackages.lockfile
];
pythonPath = [ pythonPackages.curses pythonPackages.lockfile ];
buildPhase = ''
# Fix up the LD_LIBRARY_PATH so that expat is on it
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${expat}/lib"
builder = ./builder.sh;
python mscript.py configure --prefix="$out"
python mscript.py build
'';
installPhase = ''
python mscript.py install
wrapProgram "$out/bin/roxterm" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
'';
meta = with stdenv.lib; {
homepage = http://roxterm.sourceforge.net/;
license = licenses.gpl3;
description = "Tabbed, VTE-based terminal emulator";
longDescription = ''
Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome.
'';
license = licenses.gpl3;
description = "Tabbed, VTE-based terminal emulator";
longDescription = ''
Tabbed, VTE-based terminal emulator. Similar to gnome-terminal without the dependencies on Gnome.
'';
platforms = platforms.linux;
};
}

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

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