From 5a9be6d9d97bedc760d473710c7076ff5bae0ad7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 26 May 2010 07:06:02 +0000
Subject: [PATCH] Merged from trunk

svn path=/nixpkgs/branches/stdenv-updates/; revision=21983
---
 .../networking/browsers/rekonq/default.nix          |  2 +-
 .../networking/browsers/rekonq/source.nix           |  9 +++++----
 pkgs/applications/office/openoffice/go-oo.nix       | 13 ++++++-------
 pkgs/top-level/all-packages.nix                     |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/applications/networking/browsers/rekonq/default.nix b/pkgs/applications/networking/browsers/rekonq/default.nix
index f011009c111..fc6c5c0013a 100644
--- a/pkgs/applications/networking/browsers/rekonq/default.nix
+++ b/pkgs/applications/networking/browsers/rekonq/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, fetchgit, cmake, qt4, kdelibs, automoc4, phonon, perl
-, v ? "0.4.0" }:
+, v ? "0.4.90" }:
 
 stdenv.mkDerivation (
   builtins.getAttr v (import ./source.nix { inherit fetchurl fetchgit; })
diff --git a/pkgs/applications/networking/browsers/rekonq/source.nix b/pkgs/applications/networking/browsers/rekonq/source.nix
index a30de7bfbee..5faeddaaf2a 100644
--- a/pkgs/applications/networking/browsers/rekonq/source.nix
+++ b/pkgs/applications/networking/browsers/rekonq/source.nix
@@ -3,12 +3,13 @@
 builtins.listToAttrs
 [
   {
-    name = "0.4.0";
+    name = "0.4.90";
     value = rec {
-      name = "rekonq-0.4.0";
+      name = "rekonq-0.4.90";
       src = fetchurl {
-        url = "mirror://sourceforge/rekonq/${name}.tar.bz2";
-        sha256 = "1dxpzkifqy85kwj94mhazan6f9glxvl7i02c50n3f0a12wiywwvy";
+        url = "http://kde-apps.org/CONTENT/content-files/94258-${name}.tar.bz2";
+        name = "${name}.tar.bz2";
+        sha256 = "1dmdx54asv0b4xzc8p5nadn92l8pks9cl1y9j8a46lsslwsjw3ws";
       };
     };
   }
diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix
index bdf0939d64e..ccf9238533f 100644
--- a/pkgs/applications/office/openoffice/go-oo.nix
+++ b/pkgs/applications/office/openoffice/go-oo.nix
@@ -4,17 +4,18 @@
 , bison, flex, zip, unzip, gtk, libmspack, getopt, file, cairo, which
 , icu, boost, jdk, ant, libXext, libX11, libXtst, libXi, cups
 , libXinerama, openssl, gperf, cppunit, GConf, ORBit2
-, autoconf, openldap, postgresql
+, autoconf, openldap, postgresql, bash
 , langs ? [ "en-US" "ca" "ru" "eo" "fr" "nl" "de" "en-GB" ]
 }:
 
-let version = "3.2.0"; in
+let
+  langsSpaces = stdenv.lib.concatStringsSep " " langs;
+in
 stdenv.mkDerivation rec {
   name = "go-oo-3.2.0.10";
   # builder = ./builder.sh;
 
   downloadRoot = "http://download.services.openoffice.org/files/stable";
-  versionDirs = true;
 
   src = fetchurl {
       url = "http://download.go-oo.org/OOO320/ooo-build-3.2.0.10.tar.gz";
@@ -25,7 +26,7 @@ stdenv.mkDerivation rec {
 
   # Multi-CPU: --with-num-cpus=4 
   configurePhase = ''
-    sed -i -e '1s,/bin/bash,${stdenv.bash}/bin/bash,' $(find bin -type f)
+    sed -i -e '1s,/bin/bash,${bash}/bin/bash,' $(find bin -type f)
     sed -i -e '1s,/usr/bin/perl,${perl}/bin/perl,' download.in bin/ooinstall bin/generate-bash-completion
     echo "$distroFlags" > distro-configs/SUSE-11.1.conf.in
 
@@ -128,13 +129,11 @@ stdenv.mkDerivation rec {
     ant autoconf openldap postgresql
   ];
 
-  langsSpaces = stdenv.lib.concatStringsSep " " langs;
-
   meta = {
     description = "Go-oo - Novell variant of OpenOffice.org";
     homepage = http://go-oo.org/;
     license = "LGPL";
     maintainers = [ stdenv.lib.maintainers.viric ];
-    platforms = [ stdenv.lib.platforms.linux ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb386b1d237..57d22b4c237 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8260,7 +8260,7 @@ let
     inherit stdenv fetchurl pam python tcsh libxslt perl zlib libjpeg
       expat pkgconfig freetype fontconfig libwpd libxml2 db4 sablotron
       curl libsndfile flex zip unzip libmspack getopt file cairo
-      which icu jdk ant cups openssl bison boost gperf cppunit;
+      which icu jdk ant cups openssl bison boost gperf cppunit bash;
     inherit (xlibs) libXaw libXext libX11 libXtst libXi libXinerama;
     inherit (gtkLibs) gtk;
     inherit (perlPackages) ArchiveZip CompressZlib;