tilda: fixups; seems to work now

- xgettext hack inspired by a guix thread
- gsettings to prevent crashes
- expression refactoring
This commit is contained in:
Vladimír Čunát 2014-08-29 11:27:21 +02:00
parent a4738b27cf
commit aeca8b6c3e
2 changed files with 15 additions and 10 deletions

View File

@ -1,6 +1,7 @@
{ stdenv, fetchurl, pkgconfig { stdenv, fetchurl, pkgconfig
, autoconf, automake, gettext , autoreconfHook, gettext, expat
, confuse, vte, gtk , confuse, vte, gtk
, makeWrapper
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -13,17 +14,21 @@ stdenv.mkDerivation rec {
sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix"; sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix";
}; };
buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ]; buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ];
preConfigure = '' LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build
sh autogen.sh
postInstall = ''
wrapProgram "$out/bin/tilda" \
--prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH"
''; '';
meta = { meta = with stdenv.lib; {
description = "A Gtk based drop down terminal for Linux and Unix"; description = "A Gtk based drop down terminal for Linux and Unix";
homepage = https://github.com/lanoxx/tilda/; homepage = https://github.com/lanoxx/tilda/;
license = stdenv.lib.licenses.gpl3; license = licenses.gpl3;
maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; maintainers = [ maintainers.AndersonTorres ];
platforms = stdenv.lib.platforms.linux; platforms = platforms.linux;
}; };
} }

View File

@ -9878,7 +9878,7 @@ let
tilda = callPackage ../applications/misc/tilda { tilda = callPackage ../applications/misc/tilda {
vte = gnome3.vte; vte = gnome3.vte;
gtk = gtk3; gtk = gtk3;
}; };
timidity = callPackage ../tools/misc/timidity { }; timidity = callPackage ../tools/misc/timidity { };