From f3ac7c55ecad87d72ba0aef5635cd32be7813722 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:03:25 +0000
Subject: [PATCH] Updating the go_oo expression to not to break the tarball
 (thanks to Rob)

svn path=/nixpkgs/trunk/; revision=21982
---
 pkgs/applications/office/openoffice/go-oo.nix | 13 ++++++-------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/office/openoffice/go-oo.nix b/pkgs/applications/office/openoffice/go-oo.nix
index bdf0939d64e1..ccf9238533fe 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 89e113a8ca2f..b9ac594e4020 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8273,7 +8273,7 @@ let
     inherit 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;