From aeca8b6c3e9d331e6209304d6786d25214f62506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Fri, 29 Aug 2014 11:27:21 +0200
Subject: [PATCH] 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 ++++++++++++++---------
 pkgs/top-level/all-packages.nix          |  2 +-
 2 files changed, 15 insertions(+), 10 deletions(-)

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;
   };
 }
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45c15e3ba70e..6f02f2650ace 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9878,7 +9878,7 @@ let
 
   tilda = callPackage ../applications/misc/tilda {
     vte = gnome3.vte;
-    gtk = gtk3;    
+    gtk = gtk3;
   };
 
   timidity = callPackage ../tools/misc/timidity { };