expect: "minor" update, no longer depends on X/Tk

ANN: https://groups.google.com/forum/#!topic/comp.lang.tcl/lwZjtKOfaLE
I hope this solves a darwin -lXss linkage problem.
(broke most X stuff through dejagnu -> libffi -> llvm or mesa)

+13 -9
+13 -9
pkgs/tools/misc/expect/default.nix
··· 1 - {stdenv, fetchurl, tcl, tk, xproto, libX11}: 1 + { stdenv, fetchurl, tcl }: 2 2 3 + let version = "5.45"; 4 + in 3 5 stdenv.mkDerivation { 4 - name = "expect-5.44.1"; 6 + name = "expect-${version}"; 5 7 6 8 src = fetchurl { 7 - url = http://expect.nist.gov/old/expect-5.44.1.tar.gz; 8 - sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4"; 9 + url = "mirror://sourceforge/expect/Expect/${version}/expect${version}.tar.gz"; 10 + sha256 = "0h60bifxj876afz4im35rmnbnxjx4lbdqp2ja3k30fwa8a8cm3dj"; 9 11 }; 10 12 11 - buildInputs = [tcl tk xproto libX11]; 13 + buildInputs = [ tcl ]; 12 14 13 15 #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; 14 16 ··· 23 25 export NIX_LDFLAGS="-rpath $out/lib $NIX_LDFLAGS" 24 26 ''; 25 27 26 - configureFlags = ["--with-tcl=${tcl}/lib" 28 + configureFlags = [ 29 + "--with-tcl=${tcl}/lib" 27 30 "--with-tclinclude=${tcl}/include" 28 - "--with-tk=${tk}/lib" 29 - "--exec-prefix=$out"]; 31 + "--exec-prefix=$out" 32 + ]; 33 + 34 + postInstall="cp expect $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; 30 35 31 36 meta = { 32 37 description = "A tool for automating interactive applications"; 33 38 homepage = http://expect.nist.gov/; 34 39 }; 35 - postInstall="cp expect{,k} $out/bin; mkdir -p $out/lib; cp *.so $out/lib"; 36 40 }