mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-20 04:31:52 +00:00
Code Issues Wiki Activity

Fix expect build

Browse source 
svn path=/nixpkgs/trunk/; revision=15527
This commit is contained in:
Michael Raskin 2009-05-10 11:31:17 +00:00
parent 607b018dbb
commit bee4040300
2 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/tools/misc/expect/default.nix
View file

@ -1,14 +1,14 @@
{stdenv, fetchurl, tcl}: {stdenv, fetchurl, tcl, tk, autoconf, xproto, libX11}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "expect-5.43.0"; name = "expect-5.44.1";
src = fetchurl { src = fetchurl {
url = http://expect.nist.gov/old/expect-5.43.0.tar.bz2; url = http://expect.nist.gov/old/expect-5.44.1.tar.gz;
sha256 = "1j6vyr8lx1fbl641hkkd6hhh9ifniklskfv00pbvy33h86a3mrvn"; sha256 = "13zxqiclzk1paxc0mr2vwp9nhfyr2mkwk9gs73fg0l3iss16n6p4";
}; };
buildInputs = [tcl]; buildInputs = [tcl tk autoconf xproto libX11];
#NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H"; #NIX_CFLAGS_COMPILE = "-DHAVE_UNISTD_H";
@ -19,9 +19,13 @@ stdenv.mkDerivation {
patchPhase = '' patchPhase = ''
substituteInPlace configure --replace /bin/stty "$(type -tP stty)" substituteInPlace configure --replace /bin/stty "$(type -tP stty)"
sed -e '1i\#include <tclInt.h>' -i exp_inter.c
''; '';
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"];
meta = { meta = {
description = "A tool for automating interactive applications"; description = "A tool for automating interactive applications";

3
pkgs/top-level/all-packages.nix
View file

@ -625,7 +625,8 @@ let
}; };
expect = import ../tools/misc/expect { expect = import ../tools/misc/expect {
inherit fetchurl stdenv tcl; inherit fetchurl stdenv tcl tk autoconf;
inherit (xorg) xproto libX11;
}; };
fcron = import ../tools/system/fcron { # see also cron fcron = import ../tools/system/fcron { # see also cron