* Update or disable some stuff.

svn path=/nixpkgs/trunk/; revision=5509
This commit is contained in:
Eelco Dolstra 2006-06-24 10:26:52 +00:00
parent c9db2ab939
commit 8a58852d9d
6 changed files with 14 additions and 11 deletions

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, wxGTK, chmlib}:
stdenv.mkDerivation {
name = "xchm-1.2";
name = "xchm-1.9";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/xchm-1.2.tar.gz;
md5 = "17f2cda873f61470636dbfeebb4a531d";
url = http://surfnet.dl.sourceforge.net/sourceforge/xchm/xchm-1.9.tar.gz;
md5 = "12e1faf49447c743c5c936636cd8a172";
};
buildInputs = [wxGTK chmlib];
}

View File

@ -6,11 +6,11 @@ assert libdvdplay.libdvdread.libdvdcss == libdvdcss;
assert xvSupport -> libXv != null;
stdenv.mkDerivation {
name = "vlc-0.7.2";
name = "vlc-0.8.5";
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/vlc-0.7.2.tar.gz;
md5 = "25dfcc804cb92f46c0b64ce1466515cc";
url = http://ftp.snt.utwente.nl/pub/software/videolan/vlc/0.8.5/vlc-0.8.5.tar.gz;
md5 = "90d19a5ba2ef2e03e6062fadc2e810d2";
};
buildInputs = [

View File

@ -1,10 +1,10 @@
{stdenv, fetchurl, libtool}:
stdenv.mkDerivation {
name = "chmlib-0.36";
name = "chmlib-0.38";
builder = ./builder.sh;
src = fetchurl {
url = http://nix.cs.uu.nl/dist/tarballs/chmlib-0.36.tbz;
url = http://66.93.236.84/~jedwin/projects/chmlib/chmlib-0.38.tar.bz2;
md5 = "8fa5e9a1af13084ca465d9ee09e1946e";
};
buildInputs = [libtool];

View File

@ -1,6 +1,9 @@
source $stdenv/setup
export HOME=$(pwd)/fake-home
#add ghc to search path
test -n "$ghc" && PATH=$PATH:$ghc/bin

View File

@ -811,7 +811,7 @@ rec {
strategoxt = (import ../development/compilers/strategoxt/strategoxt-0.14.nix) {
inherit fetchurl pkgconfig sdf;
aterm = aterm23x;
stdenv = overrideInStdenv stdenv [gnumake380];
stdenv = overrideGCC (overrideInStdenv stdenv [gnumake380]) gcc34;;
};
stlport = (import ../development/libraries/stlport) {

View File

@ -110,7 +110,7 @@ let {
uulib
valgrind
vim
vlc
# vlc
wget
xchm
xineUI
@ -118,7 +118,7 @@ let {
xmms
xorg_sys_opengl
xsel
zapping
# zapping
zdelta
zip
# atermjava