Updating tcl/tk

svn path=/nixpkgs/trunk/; revision=15434
This commit is contained in:
Lluís Batlle i Rossell 2009-05-03 14:35:56 +00:00
parent 63c8ccf84c
commit ef25944cdb
3 changed files with 6 additions and 6 deletions

View File

@ -1,18 +1,18 @@
{stdenv, fetchurl}: {stdenv, fetchurl}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "tcl-8.4.18"; name = "tcl-8.5.7";
src = fetchurl { src = fetchurl {
url = mirror://sourceforge/tcl/tcl8.4.18-src.tar.gz; url = mirror://sourceforge/tcl/tcl8.5.7-src.tar.gz;
sha256 = "197h3m2lc5a6famc683zhjp55774gf8zwggfy2893v48lp5p7qny"; sha256 = "1wk67qq12bdbaqsi6cxwj6ra8nc8ph1na9rh808kfk6hm18qvlk7";
}; };
preConfigure = "cd unix"; preConfigure = "cd unix";
postInstall = '' postInstall = ''
make install-private-headers make install-private-headers
ln -s $out/bin/tclsh8.4 $out/bin/tclsh ln -s $out/bin/tclsh8.5 $out/bin/tclsh
''; '';
meta = { meta = {

View File

@ -14,7 +14,7 @@ stdenv.mkDerivation {
installPhase = '' installPhase = ''
ensureDir $out/bin ensureDir $out/bin
cp ../Xspin*/xsp* $out/bin/xspin cp ../Xspin*/xsp* $out/bin/xspin
sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish8.4@' \ sed -i -e '1s@^#!/bin/sh@#!${tk}/bin/wish@' \
-e '/exec wish/d' $out/bin/xspin -e '/exec wish/d' $out/bin/xspin
cp spin $out/bin cp spin $out/bin
''; '';

View File

@ -3939,7 +3939,7 @@ let
inherit stdenv fetchurl cmake qt4; inherit stdenv fetchurl cmake qt4;
}; };
tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.4.18") { tk = composedArgsAndFun (selectVersion ../development/libraries/tk "8.5.7") {
inherit fetchurl stdenv tcl x11; inherit fetchurl stdenv tcl x11;
}; };