From 8a58852d9debba53e50b2da7457854b7b20c0493 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sat, 24 Jun 2006 10:26:52 +0000
Subject: [PATCH] * Update or disable some stuff.

svn path=/nixpkgs/trunk/; revision=5509
---
 pkgs/applications/misc/xchm/default.nix             | 6 +++---
 pkgs/applications/video/vlc/default.nix             | 6 +++---
 pkgs/development/libraries/chmlib/default.nix       | 4 ++--
 pkgs/development/libraries/haskell/uulib/builder.sh | 3 +++
 pkgs/top-level/all-packages.nix                     | 2 +-
 pkgs/top-level/build-for-release.nix                | 4 ++--
 6 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/misc/xchm/default.nix b/pkgs/applications/misc/xchm/default.nix
index 12b9bfb2f94..44476fca4dd 100644
--- a/pkgs/applications/misc/xchm/default.nix
+++ b/pkgs/applications/misc/xchm/default.nix
@@ -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];
 }
diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix
index cf1f526e77a..b926d1295f8 100644
--- a/pkgs/applications/video/vlc/default.nix
+++ b/pkgs/applications/video/vlc/default.nix
@@ -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 = [
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index 5d211278749..3745b7748e8 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -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];
diff --git a/pkgs/development/libraries/haskell/uulib/builder.sh b/pkgs/development/libraries/haskell/uulib/builder.sh
index e2d4969cb87..bdb0e81430e 100644
--- a/pkgs/development/libraries/haskell/uulib/builder.sh
+++ b/pkgs/development/libraries/haskell/uulib/builder.sh
@@ -1,6 +1,9 @@
 source $stdenv/setup
 
 
+export HOME=$(pwd)/fake-home
+
+
 #add ghc to search path
 test -n "$ghc" && PATH=$PATH:$ghc/bin
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f2cc6a0953f..a00105fdb6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -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) {
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index b114e547130..5060e840fb2 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -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