about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-04-30 11:43:04 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-04-30 18:49:27 -0700
commitc46e1049aaae1ebf1d1072b9f6296ab46becc476 (patch)
tree3d2f1e9af9c96b86621159e149354bcc9ae59d88
parent5835d577e7f4074fd637931cb03b5f6a22511a8d (diff)
downloadnixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar.gz
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar.bz2
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar.lz
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar.xz
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.tar.zst
nixlib-c46e1049aaae1ebf1d1072b9f6296ab46becc476.zip
expect: Refactor and add maintainer
-rw-r--r--pkgs/tools/misc/expect/default.nix20
1 files changed, 6 insertions, 14 deletions
diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index bfb369933889..c91d418d870e 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 ];
   };
 }