From aeca8b6c3e9d331e6209304d6786d25214f62506 Mon Sep 17 00:00:00 2001 From: Vladimír Čunát Date: Fri, 29 Aug 2014 11:27:21 +0200 Subject: tilda: fixups; seems to work now - xgettext hack inspired by a guix thread - gsettings to prevent crashes - expression refactoring --- pkgs/applications/misc/tilda/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) (limited to 'pkgs/applications/misc') diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index cb5813fa5f72..50c4184c91e9 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig -, autoconf, automake, gettext +, autoreconfHook, gettext, expat , confuse, vte, gtk +, makeWrapper }: stdenv.mkDerivation rec { @@ -13,17 +14,21 @@ stdenv.mkDerivation rec { sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix"; }; - buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ]; + buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; - preConfigure = '' - sh autogen.sh + LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + + 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"; homepage = https://github.com/lanoxx/tilda/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } + -- cgit 1.4.1