From c46e1049aaae1ebf1d1072b9f6296ab46becc476 Mon Sep 17 00:00:00 2001
From: "William A. Kennington III" <william@wkennington.com>
Date: Thu, 30 Apr 2015 11:43:04 -0700
Subject: [PATCH] expect: Refactor and add maintainer

---
 pkgs/tools/misc/expect/default.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bfb36993388..c91d418d870 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -13,25 +13,14 @@ stdenv.mkDerivation {
   buildInputs = [ tcl ];
   nativeBuildInputs = [ makeWrapper ];
 
-  #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
-
-  # http://wiki.linuxfromscratch.org/lfs/ticket/2126
-  #preBuild = ''
-  #  substituteInPlace exp_inter.c --replace tcl.h tclInt.h
-  #'';
-
   patchPhase = ''
-    substituteInPlace configure --replace /bin/stty "$(type -tP stty)"
-    sed -e '1i\#include <tclInt.h>' -i exp_inter.c
-    export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
-  '' + stdenv.lib.optionalString stdenv.isFreeBSD ''
-    ln -s libexpect.so.1 libexpect545.so
+    sed -i "s,/bin/stty,$(type -p stty),g" configure
   '';
 
   configureFlags = [
     "--with-tcl=${tcl}/lib"
     "--with-tclinclude=${tcl}/include"
-    "--exec-prefix=$(out)"
+    "--exec-prefix=\${out}"
   ];
 
   postInstall = ''
@@ -42,8 +31,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A tool for automating interactive applications";
     homepage = http://expect.nist.gov/;
+    license = "Expect";
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ wkennington ];
   };
 }