svn merge ^/nixpkgs/trunk, one simple conflict in jruby

svn path=/nixpkgs/branches/stdenv-updates/; revision=31721

1 files changed, 6 insertions, 6 deletions

diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix
index a32e5abbb29bc..d9f9b09271b5e 100644
--- a/pkgs/tools/misc/expect/default.nix
+++ b/pkgs/tools/misc/expect/default.nix
@@ -1,14 +1,14 @@
-{stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}:
+{stdenv, fetchurl, tcl, tk, xproto, libX11}:
 
 stdenv.mkDerivation {
   name = "expect-5.44.1";
-  
+
   src = fetchurl {
     url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
     sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
   };
 
-  buildInputs = [tcl tk autoconf xproto libX11];
+  buildInputs = [tcl tk xproto libX11];
 
   #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
 
@@ -22,9 +22,9 @@ stdenv.mkDerivation {
     sed -e '1i\#include <tclInt.h>' -i exp_inter.c
     export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS"
   '';
-  
-  configureFlags = ["--with-tcl=${tcl}/lib" 
-    "--with-tclinclude=${tcl}/include" 
+
+  configureFlags = ["--with-tcl=${tcl}/lib"
+    "--with-tclinclude=${tcl}/include"
     "--with-tk=${tk}/lib"
     "--exec-prefix=$out"];